Clean up Makefile a bit. Still dirty though.