Review changes per mmcdole comments