[Core] Use brackets always pt2