diff --git a/src/main/java/com/ossez/spring/security/models/entity/Person.java b/src/main/java/com/ossez/spring/security/models/entity/Person.java
index ec3988e..4cff2c3 100644
--- a/src/main/java/com/ossez/spring/security/models/entity/Person.java
+++ b/src/main/java/com/ossez/spring/security/models/entity/Person.java
@@ -17,22 +17,23 @@ import java.util.Set;
  * @author YuCheng Hu
  */
 
+
+@Entity
 @Getter
 @Setter
-@Entity
 @Accessors(chain = true)
 //@Table(name = "person", uniqueConstraints = {@UniqueConstraint(columnNames = "user_name"), @UniqueConstraint(columnNames = "user_email")})
 public class Person extends AbstractPersistable<Long> {
 
-        @NotBlank
+    @NotBlank
     @Size(max = 20)
     private String userName;
 
-        @NotBlank
+    @NotBlank
     @Size(max = 120)
     private String userPassword;
 
-        @NotBlank
+    @NotBlank
     @Email
     private String userEmail;
 
diff --git a/src/main/java/com/ossez/spring/security/models/entity/PersonRole.java b/src/main/java/com/ossez/spring/security/models/entity/PersonRole.java
index 16f8721..5f85cb7 100644
--- a/src/main/java/com/ossez/spring/security/models/entity/PersonRole.java
+++ b/src/main/java/com/ossez/spring/security/models/entity/PersonRole.java
@@ -2,12 +2,15 @@ package com.ossez.spring.security.models.entity;
 
 import com.ossez.spring.security.models.ERole;
 import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.jpa.domain.AbstractPersistable;
 
 import javax.persistence.*;
 
 @Entity
-@Data
+@Getter
+@Setter
 public class PersonRole extends AbstractPersistable<Long> {
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)