Fixed routes to be more readable