refactor module stream
fix module stream