Issue #168 - fix implementation reviews