Back to the Client! - Refactoring Form Fields