refactor onceReady and onceStopped in response to feedback