Address @albertoalias's feedback