Refactored: separated actions form user class