Resharper and coding convention fixes.