cleaned up state classes