navigator: minor refactoring