Refactored forms