Fix #2 : Adjust some constraint priorities
Rename unexpressive ivar + some code formatting