better local storage management