Add code refactoring and fix for not streamable tracks