* Use better variable names and remove unwanted code blocks.
Signed-off-by: hchiramm <hchiramm@redhat.com>

* Simplify return from InstanceID func()
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>