cleanings

no changes in the logic