Refactor listeners and config