Refactor pivot field