Refactoring form values mapping