Code refactoring
- parse streams when only when they played