CLN: Cleanup trailing whitespace. Some cleanup done in last commit