A few more tweaks from comments
Renaming a method at the suggestion of my friend Bernhard