EHN: better code comments