Cleanup
Updated users route