Refactoring of observable listeners :arrows_counterclockwise: