Revamped the Makefile to make it better