Cleaned some comments
Trying fix on stream timeout