Fixed the comments to last pull and adhered to pep8