Fixed pep8 violations and typo's