Remove val2Text
Simplify code