checkout page forms refactor