Cleanup file layout before getting into the refactor process:)
Added putIfUnchanged method to State.