Improved internal documentation