expanding cleanup, fixing