apply the reveiew comments. refs #595