Cleanup stylecop errors