Further normalization of the code's style. No substantial changes.