apply review comments. refs #921 #1052

#921