Apply suggestions from code review

Commit

2 years ago

Apply suggestions from code review Co-authored-by: Cristian Garcia <cgarcia.e88@gmail.com>