CS fixes and some syntax changes

Not sure whether we need this. If we have lots of content types, the
list could be too long to display.

We might remove this in the future.