Updating Pods and minor code cleanup