Make some minor changes for style consistency.