pep8 adherence - still some changes to go in __init__.py


Will address at some point later