NavService done - cleaned up some code