Cleaned up some issues with the local storage