Cleaned up and reorganized Makefile