Get rid of comments, update Makefile