HH-44215 pep8 and compatibility fixes
HH-44215 remove __init__.py side effects