DigiRotation refactoring