Trim trailing whitespace, minor inconsitency fix.