Incorporate feedback from @rricard
Tweaks