Refactor shiftBoard