Makefile and some cleanup