Minor refactoring
Minor refactoring

cloudfoundry-incubator/bits-service,cloudfoundry-incubator/bits-service,cloudfoundry-incubator/bits-service,cloudfoundry-incubator/bits-service,cloudfoundry-incubator/bits-service,petergtz/bitsgo,petergtz/bitsgo