Added CupcakeType, CupcakeFlavor and CupcakeSize. Cleaned up object
creation