Updated makefile to be more readable and scalable.