707cf6cd82
Improve the code as suggested during code review. Co-Authored-By: David Moreau Simard <dmsimard@redhat.com> Change-Id: I51a948d0ec590f9e1db2f9f60287a360bb8ca362