Additional cleanup to SDL file format