Encapsulating initializer for model, removing reliance on numCities property
Adding #defines, cleaning some particle effects code