container class code cleanups and todo comments