Refactor quad creation.