Add named routes
Remove useless do-while