Formulation fixes for clarity