fixed cosmetic  issues