reorganize to remove unnecessary if/else logic
reorganize to remove unnecessary if/else logic

hichameyessou/blip,hichameyessou/blip,tidepool-org/blip,hichameyessou/blip,tidepool-org/blip,tidepool-org/blip