Multiple refactor