diff --git a/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java b/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java
index 1857d92dd3ddb15e297aece55655563c576b36d4..2a67f22f93bf402148426fd8becb0ce7c8f37dfc 100644
--- a/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java
+++ b/src/main/java/es/uvigo/esei/daa/DAAExampleApplication.java
@@ -24,8 +24,10 @@ import es.uvigo.esei.daa.rest.UsersResource;
 public class DAAExampleApplication extends Application {
 	@Override
 	public Set<Class<?>> getClasses() {
-		return Stream.of(PeopleResource.class, UsersResource.class)
-			.collect(toSet());
+		return Stream.of(
+			PeopleResource.class,
+			UsersResource.class
+		).collect(toSet());
 	}
 	
 	@Override
diff --git a/src/main/java/es/uvigo/esei/daa/dao/DAO.java b/src/main/java/es/uvigo/esei/daa/dao/DAO.java
index 1a83eee76744fcedcb13c5179da85cd2d1124a42..18568740a647888a33ac61160285b631bdc01366 100644
--- a/src/main/java/es/uvigo/esei/daa/dao/DAO.java
+++ b/src/main/java/es/uvigo/esei/daa/dao/DAO.java
@@ -5,7 +5,6 @@ import java.sql.SQLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
@@ -27,11 +26,8 @@ public abstract class DAO {
 	 * Constructs a new instance of {@link DAO}.
 	 */
 	public DAO() {
-		Context initContext;
 		try {
-			initContext = new InitialContext();
-			
-			this.dataSource = (DataSource) initContext.lookup(JNDI_NAME);
+			this.dataSource = (DataSource) new InitialContext().lookup(JNDI_NAME);
 		} catch (NamingException e) {
 			LOG.log(Level.SEVERE, "Error initializing DAO", e);
 			throw new RuntimeException(e);
diff --git a/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java b/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
index 8c17b7ef2fe7a942ebad022c5e95bece5735ab58..c3b9eb763aef9d71b7188f08e2fb93416393982a 100644
--- a/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
+++ b/src/main/java/es/uvigo/esei/daa/dao/UsersDAO.java
@@ -19,6 +19,7 @@ import es.uvigo.esei.daa.entities.User;
 public class UsersDAO extends DAO {
 	private final static Logger LOG = Logger.getLogger(UsersDAO.class.getName());
 	
+	// Yes, SALT should come from external configuration (for example, a property in Tomcat's context).
 	private final static String SALT = "daaexample-";
 	
 	/**
diff --git a/src/main/java/es/uvigo/esei/daa/entities/Person.java b/src/main/java/es/uvigo/esei/daa/entities/Person.java
index 3df16c413d162b38bc5092b2f687e5255a2210bf..b2f3285a5263ba6f4316d1dfa1eadfd45ae0b2d8 100644
--- a/src/main/java/es/uvigo/esei/daa/entities/Person.java
+++ b/src/main/java/es/uvigo/esei/daa/entities/Person.java
@@ -89,7 +89,7 @@ public class Person {
 			return true;
 		if (obj == null)
 			return false;
-		if (getClass() != obj.getClass())
+		if (!(obj instanceof Person))
 			return false;
 		Person other = (Person) obj;
 		if (id != other.id)