Update with @agerlic's PR comments