Update routes again to be as clean as possible