Resolve stylecop warnings