Refactoring: Persisting on localStorage
Tidy up