Updated to follow pep8