Makefile clean up, cosmetics changes