Apply PEP8 to __init__.py.
more cleaning up
fix initializing
Regression fixes