Refactor: post-clean after separation