cleanup & fixed the makefile