Etx computation update + cleaning code