Some minor changes

Some changes, suggested by StyleCop and ReSharper