Minor cosmetic changes to code