Code review for PR #54

refs #1370
refs #1372
refs #1409