Made a few cosmetic changes