Cleanup/refactored Makefile.