Style Fixes StyleCop used

Style issue fixes.