Simplify the container