Changes following NDepend analysis