Issue #169 - fix review issues for merge