Refactoring Navigator class