Refactor quote form