more stylecop changes