Updated to use pep8