Updated and clean-up the Rotator class