Made some cosmetic changes