Change in ovirt-image-uploader[master]: Refactor to improve code readability