Increase conformance to pep8; with exception that we use tabs rather than spaces for indentation.