remove old comments
group event handlers together