[refactor][fix] return appropriate ternary result
[rename] values -> model
[-] unused regexp