Format change and comments in EFS