Cleanup code by Resharper