CLEAN::change code structure