Massive clean up of constructors and canFire