more refactoring
stylecop fixes