Incorporate suggestions from @stbuehler