some clean up made