Removed import * from __init__.py; Improved pep8 compliancy