Refactor #1 for user class