stylecop stuff, i thnk
tentative merge acceptance