Some refactoring
More refactoring
Major refactoring
Changes to saving and storing favorites
Some refactoring + cleanup
small cleanup
minor cleanup
minor refactoring