Clean up code using Resharper and CodeMaid

Hi, Mr. Bishop,
        I have finished cleaning up the code base, please take a look.

Imgen