Cleaned up the makefile and sources