Minor cosmetic changes to the code.