Spiral problem.
Cosmetic changes