Bring the code in line with the coding guidelines