refactoring: start using variable values to resolve constraints