adjust definition of state choices so they can be used in a more readable fashion