update styles + cleanup