Fix stylecop violations