Coding convention, cosmetic changes

No match.