Small refactoring and cleanup, still working (for HDS streams like "Alles was zählt")

Signed-off-by: GodLesZ <godlesz@hotmail.de>