changed some cosmetic issues