Improved make script