StyleCop clean up