Rearrange routes
Use instance var instead of class instance var