code cleanup -- over to mark