Fixing pep8 issues and removing print statements