Issue #14 Code review updates