Doing some cosmetic changes