VID-1786 Coding conventions