updated most Resharper code suggestions

I've updated most of the code per the suggestions that Resharper has
made. I have not tested the code yet. I've also updated my fork of
Massive with changes from upstream. I've also done some house cleaning.