fixed Idling unsubscribe in OnShutdown and minimal cosmetic changes