Refactored form retrieval