Add if primitive
Remove evalString
Indent with 2 spaces