refactor container setup.