Improved Make file