Changes as per @geerlingguy's request (done in vim this time, not GitHub Editor!)