Comment Router, rename function to come in line with conventions