Refactor regular item