Cleanup main Makefile a bit more