Improved internal comments