Minor function refactor
Minor function refactor

vertica/orc,jorgemarsal/orc,jorgemarsal/orc,vertica/orc,vertica/orc,vertica/orc,vertica/orc,jorgemarsal/orc,jorgemarsal/orc,vertica/orc,jorgemarsal/orc,jorgemarsal/orc,vertica/orc,jorgemarsal/orc,vertica/orc,jorgemarsal/orc