Added StyleCop Cleanups