Refactoring of validation (manual validation)