post code-review edits. Thanks Loic.