Cleanup on validator
Style fixe
Fixes valueExists