Started on internals of favourite stops
Small refactor
Cleanup