Refactored User more