Improve MakeFile