Beautifying, removing obsolete stuff etc.
Fixed up uncompressed data stream