Refactor CircularShifter