update: Refactor cleaning