clean-refactor-addWave