A pass5 optimization
Cosmetic changes