diff --git a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java
index e8f4a10156..bf3d459530 100644
--- a/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java
+++ b/persistence-modules/java-jpa/src/main/java/com/baeldung/jpa/queryparams/Employee.java
@@ -7,74 +7,73 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-
 @Entity
 @Table(name = "employees")
 public class Employee {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name = "id")
-	private Long id;
-	
-	@Column(name = "employee_number", unique = true)
-	private String empNumber;
-	
-	@Column(name = "employee_name")
-	private String name;
-	
-	@Column(name = "employee_age")
-	private int age;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
 
-	public Employee() {
-		super();
-	}
+    @Column(name = "employee_number", unique = true)
+    private String empNumber;
 
-	public Employee(Long id, String empNumber) {
-		super();
-		this.id = id;
-		this.empNumber = empNumber;
-	}
+    @Column(name = "employee_name")
+    private String name;
 
-	public Long getId() {
-		return id;
-	}
+    @Column(name = "employee_age")
+    private int age;
 
-	public void setId(Long id) {
-		this.id = id;
-	}
+    public Employee() {
+        super();
+    }
 
-	public String getName() {
-		return name;
-	}
+    public Employee(Long id, String empNumber) {
+        super();
+        this.id = id;
+        this.empNumber = empNumber;
+    }
 
-	public int getAge() {
-		return age;
-	}
+    public Long getId() {
+        return id;
+    }
 
-	public void setAge(int age) {
-		this.age = age;
-	}
+    public void setId(Long id) {
+        this.id = id;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public String getEmpNumber() {
-		return empNumber;
-	}
+    public int getAge() {
+        return age;
+    }
 
-	public void setEmpNumber(String empNumber) {
-		this.empNumber = empNumber;
-	}
+    public void setAge(int age) {
+        this.age = age;
+    }
 
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getEmpNumber() {
+        return empNumber;
+    }
+
+    public void setEmpNumber(String empNumber) {
+        this.empNumber = empNumber;
+    }
+
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
 
 }
diff --git a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
index 97f82f7914..4f320935cf 100644
--- a/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
+++ b/persistence-modules/java-jpa/src/test/java/com/baeldung/jpa/queryparams/JPAQueryParamsUnitTest.java
@@ -1,7 +1,6 @@
 package com.baeldung.jpa.queryparams;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import javax.persistence.EntityManager;
@@ -24,89 +23,87 @@ import org.junit.Test;
  */
 public class JPAQueryParamsUnitTest {
 
-	private static EntityManager entityManager;
-	
-	@BeforeClass
-	public static void setup() {
+    private static EntityManager entityManager;
+
+    @BeforeClass
+    public static void setup() {
         EntityManagerFactory factory = Persistence.createEntityManagerFactory("jpa-h2-queryparams");
         entityManager = factory.createEntityManager();
-	}
+    }
 
-	@Test
+    @Test
     public void givenEmpNumber_whenUsingPositionalParameter_thenReturnExpectedEmployee() {
-		TypedQuery<Employee> query = entityManager.createQuery(
-		        "SELECT e FROM Employee e WHERE e.empNumber = ?1" , Employee.class);
-		String empNumber = "A123";
-		Employee employee = query.setParameter(1, empNumber).getSingleResult();
+        TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = ?1", Employee.class);
+        String empNumber = "A123";
+        Employee employee = query.setParameter(1, empNumber)
+            .getSingleResult();
         Assert.assertNotNull("Employee not found", employee);
     }
 
-	@Test
+    @Test
     public void givenEmpNumberList_whenUsingPositionalParameter_thenReturnExpectedEmployee() {
-		TypedQuery<Employee> query = entityManager.createQuery(
-		        "SELECT e FROM Employee e WHERE e.empNumber IN (?1)" , Employee.class);
-		List<String> empNumbers = Arrays.asList("A123", "A124");
-		List<Employee> employees = query.setParameter(1, empNumbers).getResultList();
+        TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber IN (?1)", Employee.class);
+        List<String> empNumbers = Arrays.asList("A123", "A124");
+        List<Employee> employees = query.setParameter(1, empNumbers)
+            .getResultList();
         Assert.assertNotNull("Employees not found", employees);
         Assert.assertFalse("Employees not found", employees.isEmpty());
     }
-	
+
     @Test
     public void givenEmpNumber_whenUsingNamedParameter_thenReturnExpectedEmployee() {
-		TypedQuery<Employee> query = entityManager.createQuery(
-		        "SELECT e FROM Employee e WHERE e.empNumber = :number" , Employee.class);
-		String empNumber = "A123";
-		Employee employee = query.setParameter("number", empNumber).getSingleResult();
-		Assert.assertNotNull("Employee not found", employee);
+        TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = :number", Employee.class);
+        String empNumber = "A123";
+        Employee employee = query.setParameter("number", empNumber)
+            .getSingleResult();
+        Assert.assertNotNull("Employee not found", employee);
     }
 
     @Test
     public void givenEmpNumberList_whenUsingNamedParameter_thenReturnExpectedEmployee() {
-		TypedQuery<Employee> query = entityManager.createQuery(
-		        "SELECT e FROM Employee e WHERE e.empNumber IN (:numbers)" , Employee.class);
-		List<String> empNumbers = Arrays.asList("A123", "A124");
-		List<Employee> employees = query.setParameter("numbers", empNumbers).getResultList();
-		Assert.assertNotNull("Employees not found", employees);
-		Assert.assertFalse("Employees not found", employees.isEmpty());
+        TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber IN (:numbers)", Employee.class);
+        List<String> empNumbers = Arrays.asList("A123", "A124");
+        List<Employee> employees = query.setParameter("numbers", empNumbers)
+            .getResultList();
+        Assert.assertNotNull("Employees not found", employees);
+        Assert.assertFalse("Employees not found", employees.isEmpty());
     }
-    
+
     @Test
     public void givenEmpNameAndEmpAge_whenUsingTwoNamedParameters_thenReturnExpectedEmployees() {
-		TypedQuery<Employee> query = entityManager.createQuery(
-		        "SELECT e FROM Employee e WHERE e.name = :name AND e.age = :empAge" , Employee.class);
-		String empName = "John Doe";
-		int empAge = 55;
-		List<Employee> employees = query
-									.setParameter("name", empName)
-									.setParameter("empAge", empAge)
-									.getResultList();
-		Assert.assertNotNull("Employees not found!", employees);
-		Assert.assertTrue("Employees not found!", !employees.isEmpty());
+        TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.name = :name AND e.age = :empAge", Employee.class);
+        String empName = "John Doe";
+        int empAge = 55;
+        List<Employee> employees = query.setParameter("name", empName)
+            .setParameter("empAge", empAge)
+            .getResultList();
+        Assert.assertNotNull("Employees not found!", employees);
+        Assert.assertTrue("Employees not found!", !employees.isEmpty());
     }
 
     @Test
     public void givenEmpNumber_whenUsingCriteriaQuery_thenReturnExpectedEmployee() {
-		CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+        CriteriaBuilder cb = entityManager.getCriteriaBuilder();
 
-		CriteriaQuery<Employee> cQuery = cb.createQuery(Employee.class);
-		Root<Employee> c = cQuery.from(Employee.class);
-		ParameterExpression<String> paramEmpNumber = cb.parameter(String.class);
-		cQuery.select(c).where(cb.equal(c.get(Employee_.empNumber), paramEmpNumber));
-		
-		TypedQuery<Employee> query = entityManager.createQuery(cQuery);
-		String empNumber = "A123";
-		query.setParameter(paramEmpNumber, empNumber);
-		Employee employee = query.getSingleResult();
-		Assert.assertNotNull("Employee not found!", employee);
+        CriteriaQuery<Employee> cQuery = cb.createQuery(Employee.class);
+        Root<Employee> c = cQuery.from(Employee.class);
+        ParameterExpression<String> paramEmpNumber = cb.parameter(String.class);
+        cQuery.select(c)
+            .where(cb.equal(c.get(Employee_.empNumber), paramEmpNumber));
+
+        TypedQuery<Employee> query = entityManager.createQuery(cQuery);
+        String empNumber = "A123";
+        query.setParameter(paramEmpNumber, empNumber);
+        Employee employee = query.getSingleResult();
+        Assert.assertNotNull("Employee not found!", employee);
     }
 
     @Test
     public void givenEmpNumber_whenUsingLiteral_thenReturnExpectedEmployee() {
-		String empNumber = "A123";
-	    TypedQuery<Employee> query = entityManager.createQuery(
-	            "SELECT e FROM Employee e WHERE e.empNumber = '" + empNumber + "'", Employee.class);
-	    Employee employee = query.getSingleResult();
-	    Assert.assertNotNull("Employee not found!", employee);
+        String empNumber = "A123";
+        TypedQuery<Employee> query = entityManager.createQuery("SELECT e FROM Employee e WHERE e.empNumber = '" + empNumber + "'", Employee.class);
+        Employee employee = query.getSingleResult();
+        Assert.assertNotNull("Employee not found!", employee);
     }
 
 }