Refactoring
Add notes about Streams