pizza modal refacted: logic extracted to factories
merged conflicts