Refactoring users module.