little cleanup of the Makefile logic and modules