Addressing review comments to reuse funcitons