Refactored the listeners for windowing