Cleaning up StyleCop errors