Refactored code
Added phony make variable to force a build