Refactor project form