Code now mostly complies with the code convention.