style(*): more fixes