Allow loading streams
Add comment
Code cleanup