minor cleanup of callbacks with storage.get