Formatting
Reconcile with addcontent boilerplate