refactoring indentation & add container