Update Wave.qml

Done some refactoring