Reformat according to CAF coding convention