Cleaning up makefile to make it more reusable