pep8 and compatibility fixes
remove __init__.py side effects