[Added] Refactoring in rotate methods