Added __init__.py
Simplified code