Simplified the engine wiring and made it more consistent.