Fixed StyleCop issues