Refactored Django forms