Incorporate suggestions by @crawfordsm