refactor & close non closed containers.