VID-2077 Small comment and ordering changes