Code cleanup + code to cleanup data
Merge branch 'master' of https://github.com/petrbouchal/FastStream