More cleaning; remove trailing whitespace.