Small refactor
Small refactor

Signed-off-by: Phan Le <f2c5995718b197bbd6f63c99e8aab6ee2af1c495@pivotal.io>

allomov/bosh-agent,Altoros/bosh-agent,alex8023/bosh-agent,alex8023/bosh-agent,mattcui/bosh-agent,gu-bin/bosh-agent,evanfarrar/bosh-agent,allomov/bosh-agent,uzzz/bosh-agent,cloudfoundry/bosh-agent,cloudfoundry/bosh-agent,karafelix/bosh-agent,tacgomes/bosh-agent,karafelix/bosh-agent,tacgomes/bosh-agent,tacgomes/bosh-agent,karafelix/bosh-agent,jfuerth/bosh-agent,uzzz/bosh-agent,pivotal-nader-ziada/bosh-agent,gu-bin/bosh-agent,pivotal-nader-ziada/bosh-agent,Altoros/bosh-agent,mattcui/bosh-agent,Altoros/bosh-agent,allomov/bosh-agent,evanfarrar/bosh-agent,jfuerth/bosh-agent,evanfarrar/bosh-agent,uzzz/bosh-agent,pivotal-nader-ziada/bosh-agent,alex8023/bosh-agent,gu-bin/bosh-agent,mattcui/bosh-agent