Small cleanup to routes