Improve the make rule