Call should be 'state' not 'getState'
Clean up the logic on getValues calls