Refactor Zellers Congruence