apply review comments. refs #924 and #1052

#924