Cleaned up __init__.py. Needs commenting