michaels
committed
on 17 May 05
lots more cleaning