Add some cosmetic changes