Fix container types.
Fix code style.