Reformat Listener Publisher methods
Refactoring + Tests