Refactor get-containers