Update notes for submitted changes

* Refactor some router-related methods