Complete listener and tidied service config