Some cleanup to Makefile organization