refactor navitus