Refactor (use before_action)