VID-2032 code convention cleanup