Minor refactor
Add .PHONY to Makefile