Took care of StyleCop errors