addressing @kaelig 's comments. Hoping indentation is satisfactory...