Fix issues reported by pep8