more cleanups (trailing spaces)