Fix pep8 issues and typos