Fixed routes to avoid unnecessary code