pod refactor