apply review comments. refs #922 and #1052

#922