cosmetic cleanups to containers private data structure code