Some of StyleCop errors removed