Route naming fix and more code cleanup