Refactor logic slightly
Refactor logic slightly

idlweb/cuttlefish,pratyushmittal/cuttlefish,idlweb/cuttlefish,idlweb/cuttlefish,pratyushmittal/cuttlefish,pratyushmittal/cuttlefish,pratyushmittal/cuttlefish,idlweb/cuttlefish