Simplify makefile
Incorporate some of Jon's comments and add TODOs