apply review comments. refs #920 #1052

#920