Refactor reduction