Refs #134: Code Review improvements