Refactor on action items