General improvements in the engine code design.