Indentation fix
Adapted Validator class to be used in RPC too