apply review comments. refs #923 and #1052

#923