Cleaning up routing implementation/helpers.