[upd] code cleaning