Refactored Form