Made ODP and ODS pep8 compliant