Correct trailing white-space issues