Refactoring Registrator making validations more explicit