merge and cosmetic changes