Shaped up Makefile a bit