Incorporate suggested cleanup by @dfed