Make container ordering clearer

Thanks @gregwebs for the suggestions!