Apply suggestions from code review

Co-authored-by: Johel Ernesto Guerrero Peña <[email protected]>

Author: jensmaurer