Updated code to fit Pep8 standards