checkstyle fixes to be pep8 compliant