cleaned up arguments in states classes __init__