Simplify get-images and get-containers
Refactor up method