Some readability in baremetal module
vCenter revisited