some code cleanup, DBG -> LOGGER
added a service handler