some cleanup (comments & trace)