Changes to be pep8 compliant + typo