VID-1156 formatting fixes