Improved MakeFile