Cleanup
Added local storage