Make code more pep8 compliant