Whitespace and empty destructor removal, minor coding style changes