Minor cosmetic changes in code