diff --git a/1ano/2semestre/poo/src/aula02/AverageSpeed.java b/1ano/2semestre/poo/src/aula02/AverageSpeed.java
index 6f1b11d..1605d14 100644
--- a/1ano/2semestre/poo/src/aula02/AverageSpeed.java
+++ b/1ano/2semestre/poo/src/aula02/AverageSpeed.java
@@ -1,11 +1,9 @@
 package aula02;
 
-import java.util.Scanner;
-
-// Código da package utils disponível em
-// https://github.com/TiagoRG/uaveiro-leci/tree/master/1ano/2semestre/poo/src/utils
 import utils.UserInput;
 
+import java.util.Scanner;
+
 // Solução do exercício 5
 
 public class AverageSpeed {
diff --git a/1ano/2semestre/poo/src/aula03/Calendar.java b/1ano/2semestre/poo/src/aula03/Calendar.java
index f1770ca..5e034cd 100644
--- a/1ano/2semestre/poo/src/aula03/Calendar.java
+++ b/1ano/2semestre/poo/src/aula03/Calendar.java
@@ -1,6 +1,7 @@
 package aula03;
 
 import utils.UserInput;
+
 import java.util.Scanner;
 
 // Solução do exercício 5
diff --git a/1ano/2semestre/poo/src/aula03/Grades.java b/1ano/2semestre/poo/src/aula03/Grades.java
index c3426a4..493ab79 100644
--- a/1ano/2semestre/poo/src/aula03/Grades.java
+++ b/1ano/2semestre/poo/src/aula03/Grades.java
@@ -1,8 +1,9 @@
 package aula03;
 
-import java.util.Scanner;
 import utils.UserInput;
 
+import java.util.Scanner;
+
 // Solução do exercício 4 com o utilizador a introduzir as notas individualmente
 
 public class Grades {
diff --git a/1ano/2semestre/poo/src/aula03/HiLo.java b/1ano/2semestre/poo/src/aula03/HiLo.java
index b95fbb5..46d55b8 100644
--- a/1ano/2semestre/poo/src/aula03/HiLo.java
+++ b/1ano/2semestre/poo/src/aula03/HiLo.java
@@ -1,6 +1,7 @@
 package aula03;
 
 import utils.UserInput;
+
 import java.util.Random;
 import java.util.Scanner;
 
diff --git a/1ano/2semestre/poo/src/aula03/Investment.java b/1ano/2semestre/poo/src/aula03/Investment.java
index 92cb2cd..e3108aa 100644
--- a/1ano/2semestre/poo/src/aula03/Investment.java
+++ b/1ano/2semestre/poo/src/aula03/Investment.java
@@ -1,6 +1,7 @@
 package aula03;
 
 import utils.UserInput;
+
 import java.util.Scanner;
 
 // Solução do exercício 2
diff --git a/1ano/2semestre/poo/src/aula03/PrimesSum.java b/1ano/2semestre/poo/src/aula03/PrimesSum.java
index b93a897..5784f25 100644
--- a/1ano/2semestre/poo/src/aula03/PrimesSum.java
+++ b/1ano/2semestre/poo/src/aula03/PrimesSum.java
@@ -2,6 +2,7 @@ package aula03;
 
 import utils.MathTools;
 import utils.UserInput;
+
 import java.util.Scanner;
 
 // Solução do exercício 1
diff --git a/1ano/2semestre/poo/src/aula03/StringExtras.java b/1ano/2semestre/poo/src/aula03/StringExtras.java
index d5db692..dcf6908 100644
--- a/1ano/2semestre/poo/src/aula03/StringExtras.java
+++ b/1ano/2semestre/poo/src/aula03/StringExtras.java
@@ -1,8 +1,9 @@
 package aula03;
 
-import java.util.Scanner;
 import utils.StringMethods;
 
+import java.util.Scanner;
+
 public class StringExtras {
     public static void main(String[] args) {
         Scanner sin = new Scanner(System.in);
diff --git a/1ano/2semestre/poo/src/aula06/ex1/PersonTest.java b/1ano/2semestre/poo/src/aula06/ex1/PersonTest.java
index f67c561..64362c4 100644
--- a/1ano/2semestre/poo/src/aula06/ex1/PersonTest.java
+++ b/1ano/2semestre/poo/src/aula06/ex1/PersonTest.java
@@ -1,8 +1,9 @@
 package aula06.ex1;
 
-import java.util.Scanner;
 import utils.DateYMD;
 
+import java.util.Scanner;
+
 public class PersonTest {
     public static void main(String[] args) {
         Scanner sin = new Scanner(System.in);
diff --git a/1ano/2semestre/poo/src/aula06/ex1/Student.java b/1ano/2semestre/poo/src/aula06/ex1/Student.java
index 31c0d95..b759397 100644
--- a/1ano/2semestre/poo/src/aula06/ex1/Student.java
+++ b/1ano/2semestre/poo/src/aula06/ex1/Student.java
@@ -1,6 +1,7 @@
 package aula06.ex1;
 
 import utils.DateYMD;
+
 import java.time.LocalDate;
 
 public class Student extends Person {
diff --git a/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java b/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java
index 6271af8..7724aa0 100644
--- a/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java
+++ b/1ano/2semestre/poo/src/aula08/ex1/Vehicles/Vehicle.java
@@ -1,8 +1,8 @@
 package aula08.ex1.Vehicles;
 
 import aula08.ex1.Interfaces.IKmTravelled;
-import aula08.ex1.VehicleComp;
 import aula08.ex1.Main;
+import aula08.ex1.VehicleComp;
 import utils.Validations;
 
 import java.util.Objects;
diff --git a/1ano/2semestre/poo/src/aula08/ex2/Dishes/Dish.java b/1ano/2semestre/poo/src/aula08/ex2/Dishes/Dish.java
index 327f113..30504aa 100644
--- a/1ano/2semestre/poo/src/aula08/ex2/Dishes/Dish.java
+++ b/1ano/2semestre/poo/src/aula08/ex2/Dishes/Dish.java
@@ -1,6 +1,7 @@
 package aula08.ex2.Dishes;
 
 import aula08.ex2.Aliments.Aliment;
+
 import java.util.LinkedList;
 import java.util.Objects;
 
diff --git a/1ano/2semestre/poo/src/aula08/ex2/Menu.java b/1ano/2semestre/poo/src/aula08/ex2/Menu.java
index 1af5082..724c53a 100644
--- a/1ano/2semestre/poo/src/aula08/ex2/Menu.java
+++ b/1ano/2semestre/poo/src/aula08/ex2/Menu.java
@@ -1,8 +1,13 @@
 package aula08.ex2;
 
 import aula08.ex2.Aliments.*;
-import aula08.ex2.Dishes.*;
-import aula08.ex2.Enums.*;
+import aula08.ex2.Dishes.DietDish;
+import aula08.ex2.Dishes.Dish;
+import aula08.ex2.Dishes.VeganDish;
+import aula08.ex2.Enums.AlimentType;
+import aula08.ex2.Enums.DishType;
+import aula08.ex2.Enums.FishState;
+import aula08.ex2.Enums.MeatType;
 import utils.Enums.Weekday;
 
 import java.util.LinkedHashMap;
diff --git a/1ano/2semestre/poo/src/aula08/ex3/Purchase.java b/1ano/2semestre/poo/src/aula08/ex3/Purchase.java
index d6a1afb..35622f9 100644
--- a/1ano/2semestre/poo/src/aula08/ex3/Purchase.java
+++ b/1ano/2semestre/poo/src/aula08/ex3/Purchase.java
@@ -1,6 +1,7 @@
 package aula08.ex3;
 
 import aula08.ex3.Interfaces.IPurchase;
+
 import java.util.LinkedHashMap;
 
 public class Purchase implements IPurchase {
diff --git a/1ano/2semestre/poo/src/aula09/ex3/PlaneManager.java b/1ano/2semestre/poo/src/aula09/ex3/PlaneManager.java
index 10a6d1c..7917322 100644
--- a/1ano/2semestre/poo/src/aula09/ex3/PlaneManager.java
+++ b/1ano/2semestre/poo/src/aula09/ex3/PlaneManager.java
@@ -1,6 +1,6 @@
 package aula09.ex3;
 
-import java.util.*;
+import java.util.LinkedList;
 
 public class PlaneManager {
     private final LinkedList<Plane> planes = new LinkedList<>();
diff --git a/1ano/2semestre/poo/src/aula11/ex1/WordPairCounter.java b/1ano/2semestre/poo/src/aula11/ex1/WordPairCounter.java
index 8549816..ccf4516 100644
--- a/1ano/2semestre/poo/src/aula11/ex1/WordPairCounter.java
+++ b/1ano/2semestre/poo/src/aula11/ex1/WordPairCounter.java
@@ -1,10 +1,13 @@
 package aula11.ex1;
 
-import java.io.*;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Scanner;
+import java.util.TreeMap;
 
 public class WordPairCounter {
     public static void main(String[] args) {
diff --git a/1ano/2semestre/poo/src/aula11/ex2/Gradebook.java b/1ano/2semestre/poo/src/aula11/ex2/Gradebook.java
index 5c2b05a..79cc9f7 100644
--- a/1ano/2semestre/poo/src/aula11/ex2/Gradebook.java
+++ b/1ano/2semestre/poo/src/aula11/ex2/Gradebook.java
@@ -1,10 +1,11 @@
 package aula11.ex2;
 
-import java.io.*;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.Arrays;
+import java.util.LinkedList;
 
 public class Gradebook {
     private final LinkedList<Student> students = new LinkedList<>();
diff --git a/1ano/2semestre/poo/src/aula11/ex4/FlightManager.java b/1ano/2semestre/poo/src/aula11/ex4/FlightManager.java
index 9496d81..327c527 100644
--- a/1ano/2semestre/poo/src/aula11/ex4/FlightManager.java
+++ b/1ano/2semestre/poo/src/aula11/ex4/FlightManager.java
@@ -1,9 +1,11 @@
 package aula11.ex4;
 
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
-import java.io.*;
 import java.util.stream.Collectors;
 
 public class FlightManager {