small style fixes and refactoring so that we don't use container inside contaier