Improves the navigation code structure.