Finished Wayne's suggestion.
Minor tweaks.