Code improvements thanks to NDepend