Issue #163 - Fixing implementation review comments