Cleanup to follow the code standard in the rest of the code base