Make the container and the containee clearer