[refs #36] Incorporates codereview suggestions.