Cleanup

Using Resharper now - https://www.jetbrains.com/resharper/
Definitely recommend it!