Cleaned up a few StyleCop things