Made variable names match up and changed order of routes