Modifications to make fully pep8 compliant