Fix trailing whitespace and add remove unneeded Swap member function