update gathering and cleaning