some cosmetic improvements