Refactoring + UserProfile