Reformat files
Add rank (and reformat files)
Store column name, not the order form.  (containing a typo, by the way ;))

Comment CLAN_* as they are not used