Refactored user routes part 1 of 2