Better makefile. A tiny bit of cleanup.