Addressing review comments from @gregersrygg