yon
committed
on 16 Apr 02
cleaned up to prepare for adding functionality