clean up, fix localstorage