Fixed a typo and simplified Makefile