edit preamble for spacing, indention
Merge branch 'cf'