cosmetic improvements - 2