Format

pom.xml

@@ -28,6 +28,12 @@
 	    <artifactId>joda-time</artifactId>
 	    <version>2.9.9</version>
 	</dependency>
+      <dependency>
+          <groupId>org.jetbrains</groupId>
+          <artifactId>annotations</artifactId>
+          <version>RELEASE</version>
+          <scope>compile</scope>
+      </dependency>
 
   </dependencies>
 </project>

src/Person.java

@@ -1,64 +1,58 @@
 public class Person {
 
-	private Account account;
+    private Account account;
-	private Education edu;
+    private Education edu;
-	private String name;
+    private String name;
-	private Car car;
+    private Car car;
-	private Location location;
+    private Location location;
 
 
-	public Person(int ID, String name, Level lvl) {
+    public Person(int ID, String name, Level lvl) {
-		account = new Account(name,ID);
+        account = new Account(name, ID);
-		edu = new Education(null, null, lvl);
+        edu = new Education(null, null, lvl);
-		car = new Car();
+        car = new Car();
-		location = new Location();
+        location = new Location();
-		this.name = name;				
+        this.name = name;
-	}
+    }
 
-	public Account getAccount() {
+    public Account getAccount() {
-		return account;
+        return account;
-	}
+    }
 
-	public Education getEdu() {
+    public Education getEdu() {
-		return edu;
+        return edu;
-	}
+    }
 
-	public Car getCar() {
+    public Car getCar() {
-		return car;
+        return car;
-	}
+    }
 
-	public String getName() {
+    public void setCar(Car car) {
-		return name;
+        this.car = car;
-	}
+    }
 
-	public void setName(String name) {
+    public String getName() {
-		this.name = name;
+        return name;
-	}
+    }
 
-	public Location getLocation() {
+    public void setName(String name) {
-		return location;
+        this.name = name;
-	}
+    }
 
-	public void setLocation(Location location) {
+    public Location getLocation() {
-		this.location = location;
+        return location;
-	}
+    }
 
-	public void setCar(Car car) {
+    public void setLocation(Location location) {
-		this.car = car;
+        this.location = location;
-	}
+    }
 
-	public boolean hasCar() {
+    public boolean hasCar() {
-		if (car.getMake() != null) {
+        return car.getMake() != null;
-			return true;
+    }
-		}
-		else return false;
-	}
 
-	public boolean isPHD() {
+    public boolean isPHD() {
-		if (this.edu.getLevel() == Level.PHD) {
+        return this.edu.getLevel() == Level.PHD;
-			return true;
+    }
-		}
-		else return false;
-	}
 
 }