Can't rely on MediaStream which may be killed while stream sessions is kept + code cleaning and comments