Removed private methods
Removed private methods

Moved the logic into the public methods now it's only called from one
place

grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation,grahammendick/navigation