Fixes #79 - Cleaned up UsersController