More consitent routing/comments