chore($handler-cleanup): comment adjustment #1157
chore($handler-cleanup): various adjustments #1157