cleanup
makefile refactoring