Fix typo bug in prev commit; Clean up Makefile