fixed cosmetic improvements