Added pep8 target to Makefile and cleaned up code.