Changes after feedback on the PR from Bruno.