Refactorings related to #52

Removed guard code to be consistent with the call to ClickControl a line above,
the guard code was hangover from when the listeners were being added in a different
section of code. Removed `pan` variable in favour of `this.navigation`.