1) Refactored Rotor class.
minor changes