refs #953, make small code review fixes