Fixed few StyleCop violations