Cleanup after the merge.
Reformated some documentation.