make clean works
organized and cleaned up Makefile