Apply some ReSharper suggestions