path: Update with respect to review comments in #427