Ran a full cleanup with ReSharper