Started cleaning up with ReSharper
Cleaned up with ReSharper