Incorporate @arrbee's suggestions.