small changes
some cosmetic changes