Extract quad creation to function #143