Tidy
Refactor route and session data