To compare values between two states, an appropriate tool to replace hard coded comparision could be [sebastian bergmann's comparator](https://github.com/sebastianbergmann/comparator)