This code is more organized and robust.
Signed-off-by: NKenneth D'souza <kdsouza@redhat.com>
Signed-off-by: NRoberto Bergantinos Corpas <rbergant@redhat.com>
Signed-off-by: NSteve French <stfrench@microsoft.com>