Rotation finished, minor refactoring done.