Incorporate @deanishe's feedback (part 1) [ci skip]