Cleanup and simplification of Makefile