reverted some of the cosmetic changes