[Core] Code Style - always use brackets - part6