Update pod plus small code cleanup.