efficiency improvements
Improved notation and cosmetic changes