Cleaned up file format.