Refactor and rearrange Suspender for clones