Updated Makefile to be more dynamic