Refactor: pick up container