cleaned up and added makefile