Global refactoring for contineous listening