Fixed some StyleCop issues