chore(HttpStream): improve overall code structure