Initial cleanup and minor fix to makefile