Edits to formatter, defclass, and the caption of the types figure