Add a map of discover flow.
Improve readability
Clean up