Comments and ReSharper clean up