PizzaStore code cleanup