Change state definition to more readable