Clean up code using Resharper and CodeMaid

Hi, Mr. Bishop,