Some alterations to the coding conventions