Stylecop, refactoring, close to finish