a lot of small internal cosmetic changes