Minor changes to make code pep8 compliant