Minor changes cosmetics