Make a few cosmetic changes