Fixed even more StyleCop issues