Refactor Users for readability and consistency