Formulation and small edits