Initial Constraint update
Refactoring