Refactor multiple