added some cosmetic modifications