Improved internal documentation and removed unused field.