Modify routes to be idiomatic