Refactored makefile further