Align the code with the conventions.