Changed makefile
Cleaned up