cleaned up, now with Makefile!