improve structure of pod utility