More typos
Cleanup in settings UI/storage