Refactored reuse