Add suggestions made by Luiz Barone.

Thank you.