Removing pep8 errors and updating the makefile