stomp client refactoring