xformat -> format
Merge pull request #1286 from NilsBossung/xformat

remove the last traces of xformat
fix code section indents