more cleanup - more styles