- Improved average calculation