tidy from CVS commit