Improved __init__.py readability