Refactoring contact forms