More reformatting of coffee files.