cleanup & update makefile