Cleaned up makefile once again