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

@@ -8,7 +8,7 @@ public class Person {
 
 
     public Person(int ID, String name, Level lvl) {
-		account = new Account(name,ID);
+        account = new Account(name, ID);
         edu = new Education(null, null, lvl);
         car = new Car();
         location = new Location();
@@ -27,6 +27,10 @@ public class Person {
         return car;
     }
 
+    public void setCar(Car car) {
+        this.car = car;
+    }
+
     public String getName() {
         return name;
     }
@@ -43,22 +47,12 @@ public class Person {
         this.location = location;
     }
 
-	public void setCar(Car car) {
-		this.car = car;
-	}
-
     public boolean hasCar() {
-		if (car.getMake() != null) {
-			return true;
-		}
-		else return false;
+        return car.getMake() != null;
     }
 
     public boolean isPHD() {
-		if (this.edu.getLevel() == Level.PHD) {
-			return true;
-		}
-		else return false;
+        return this.edu.getLevel() == Level.PHD;
     }
 
 }