clean code in ECN/*