Simplify local/session storage handling