Minor code simplification for Containers api
Merge pull request #2678 from cxmcc/minor

Minor code simplification for Containers api