[TASK] Slight logic cleanup in FluxService