Changes according to PR review