major cosmetic rewrite