Tidy up some Verbose and DEBUG output

Signed-off-by: Owen Smith <owen.smith@citrix.com>