- Comment additions
- Minor code layout changes
- Ensure that we only sort the lists once