VID-1996 comments and formating