Change 'state' values to strings and simplify list