Cosmetic changes in the code.