WS: More readable code -> Callback methods called only from one site are moved as inline methods