Reuse refactor