better comments for handler code