first round of styles clean up