Whitespace fixes and make (c)gvm a unique_ptr