some clean'ups