gustafn
committed
on 25 Jun 07
some cleanup