Tweaked in response to some linter suggestions