factored out a connection stream service; cleanup