More cleanup, just removing trailing spaces everywhere.