Clean up of trailing whitespace