Cleaned up __init__