Cosmetic changes to code