VID-2127 updated comment, fix spacing, use new array syntax