ISSUE-27 Code analysis revisions.