Restored trailing spaces to clean up PR diff