cleaning up the engine start/stop logic