Improve notation
Simplify constraints matching