After code review fixes. refs #403