slight refactoring around close listeners