style(*) improvements