Code cleanup and update pod spec.