Refactoring on CheckList Listeners