serious cleaning afforded by visual studio

however it doesn't seem to be cool with MOVE semantics