Refactored value comparison rules