fixing some cosmetic issues