Reorganization & implementation of equality constraints