Issue #168 - resolving implementation reviewing
Issue #168 - resolve implementation review issues