Refactoring in the Route navigation activity