more rotations refactor + fmt