Code cleanup and pod spec version bump