Couple cosmetic changes to code.