USersController refactor