Use Resharper and CodeMaid to clean up the code
Fix broken unit tests
Minor change