Refactor user actions