Tweak cleaning private storage
Correct naming
Correct options ordering