Validation refactor done!