refactor users controller

Thoughts?