clean-up of __init__.py