Reindent/reorder, and cleanup some

Validated with csl-repository.rnc