Minor changes after reviewing @joanromano latest PR.