Refactoring form