Fix pep8 warning and errors