Some manual cleanup. commit before ReSharper stuff
ReSharper refactoring