Use Resharper and CodeMaid to clean up the code