diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
index 551f0dc5..1f4e5f56 100644
--- a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
@@ -21,7 +21,7 @@ public class FeedEntryContent extends AbstractModel {
 
 	@Column(length = 2048)
 	private String title;
-	
+
 	@Column(length = 40)
 	private String titleHash;
 
diff --git a/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java b/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java
index a6f1ec73..4ab01ab6 100644
--- a/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java
+++ b/src/main/java/com/commafeed/backend/rome/RSS090DescriptionConverter.java
@@ -8,7 +8,7 @@ import com.sun.syndication.feed.synd.impl.ConverterForRSS090;
 
 /**
  * Support description tag for RSS09
- *
+ * 
  */
 public class RSS090DescriptionConverter extends ConverterForRSS090 {
 
diff --git a/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java b/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java
index 04ba9423..567ec755 100644
--- a/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java
+++ b/src/main/java/com/commafeed/backend/rome/RSS090DescriptionParser.java
@@ -8,7 +8,7 @@ import com.sun.syndication.io.impl.RSS090Parser;
 
 /**
  * Support description tag for RSS09
- *
+ * 
  */
 public class RSS090DescriptionParser extends RSS090Parser {
 
diff --git a/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java b/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java
index 4f8b9768..ad86406f 100644
--- a/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedEntryContentService.java
@@ -18,11 +18,11 @@ public class FeedEntryContentService {
 	 * this is NOT thread-safe
 	 */
 	public FeedEntryContent findOrCreate(FeedEntryContent content, String baseUrl) {
-		
+
 		String contentHash = DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.getContent()));
 		String titleHash = DigestUtils.sha1Hex(StringUtils.trimToEmpty(content.getTitle()));
 		Long existingId = feedEntryContentDAO.findExisting(contentHash, titleHash);
-		
+
 		FeedEntryContent result = null;
 		if (existingId == null) {
 			content.setContentHash(contentHash);
diff --git a/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java b/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java
index 132cc3a3..5eb9fb61 100644
--- a/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java
+++ b/src/main/java/com/commafeed/backend/services/PasswordEncryptionService.java
@@ -21,14 +21,12 @@ public class PasswordEncryptionService implements Serializable {
 
 	private static final Logger log = LoggerFactory.getLogger(UserDAO.class);
 
-	public boolean authenticate(String attemptedPassword,
-			byte[] encryptedPassword, byte[] salt) {
+	public boolean authenticate(String attemptedPassword, byte[] encryptedPassword, byte[] salt) {
 		// Encrypt the clear-text password using the same salt that was used to
 		// encrypt the original password
 		byte[] encryptedAttemptedPassword = null;
 		try {
-			encryptedAttemptedPassword = getEncryptedPassword(
-					attemptedPassword, salt);
+			encryptedAttemptedPassword = getEncryptedPassword(attemptedPassword, salt);
 		} catch (Exception e) {
 			// should never happen
 			log.error(e.getMessage(), e);
diff --git a/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java b/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java
index ea3ec2b6..a662e71d 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/PubSubHubbubCallbackREST.java
@@ -88,18 +88,18 @@ public class PubSubHubbubCallbackREST {
 	@POST
 	@Consumes({ MediaType.APPLICATION_ATOM_XML, "application/rss+xml" })
 	public Response callback() {
-		
+
 		if (!applicationSettingsService.get().isPubsubhubbub()) {
 			return Response.status(Status.FORBIDDEN).entity("pubsubhubbub is disabled").build();
 		}
-		
+
 		try {
 			byte[] bytes = IOUtils.toByteArray(request.getInputStream());
-			
+
 			if (ArrayUtils.isEmpty(bytes)) {
 				return Response.status(Status.BAD_REQUEST).entity("empty body received").build();
 			}
-			
+
 			FetchedFeed fetchedFeed = parser.parse(null, bytes);
 			String topic = fetchedFeed.getFeed().getPushTopic();
 			if (StringUtils.isBlank(topic)) {