Fixed stylecop violatons