Improve commenting in the handler code