Updating makefile and cleaning up source.