included stylecop and fixes