Minor changes - unification of rotations, some formatting