Added makefile and cleared out some problematic syntax