Added changes to comply with pep8