Refactoring to Form