Refactor working well.