issue_1676 cleanup after code review