Cleaned up the EffectContainer Class