Updated code to Pep8 standards