cleaned up makefile more