Refactor after validation.