Refactor cleaning