small fix in SimpleContainer and refactoring