More formatting and dox cleanup.