[Improved] Simplify some routes