Cleanup some trailing whitespace
Cleanup white-space