Refactor pass