Incorporating suggestions by @filbranden