Issue #28: pep8 compliance