more stylecop-inspired changes