Cleanup some trailing whitespace