Removed whitespace
Cleanup the makefiles