performance improvements
cosmetic alterations