diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java
index 1dcd4fe66..e4e76937a 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSCustomNetworkLink.java
@@ -135,7 +135,7 @@ public class OPDSCustomNetworkLink extends OPDSNetworkLink implements ICustomNet
 
 		if (!opensearchDescriptionURLs.isEmpty()) {
 			LinkedList<ZLNetworkRequest> requests = new LinkedList<ZLNetworkRequest>();
-			for (String url: opensearchDescriptionURLs) {
+			for (String url : opensearchDescriptionURLs) {
 				requests.add(new ZLNetworkRequest(url, quietly) {
 					@Override
 					public void handleStream(InputStream inputStream, int length) throws IOException, ZLNetworkException {
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java b/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
index b84fad08a..8615e673a 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSFeedHandler.java
@@ -167,7 +167,7 @@ class OPDSFeedHandler extends AbstractOPDSFeedHandler implements OPDSConstants {
 
 		final OPDSNetworkLink opdsLink = (OPDSNetworkLink)myData.Link;
 		boolean hasBookLink = false;
-		for (ATOMLink link: entry.Links) {
+		for (ATOMLink link : entry.Links) {
 			final MimeType mime = MimeType.get(link.getType());
 			final String rel = opdsLink.relation(link.getRel(), mime);
 			if (rel == null
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
index 9c0b838d3..270b40a26 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSNetworkLink.java
@@ -160,7 +160,7 @@ public abstract class OPDSNetworkLink extends AbstractNetworkLink {
 	public String rewriteUrl(String url, boolean isUrlExternal) {
 		final int apply = isUrlExternal
 			? URLRewritingRule.APPLY_EXTERNAL : URLRewritingRule.APPLY_INTERNAL;
-		for (URLRewritingRule rule: myUrlRewritingRules) {
+		for (URLRewritingRule rule : myUrlRewritingRules) {
 			if ((rule.whereToApply() & apply) != 0) {
 				url = rule.apply(url);
 			}
diff --git a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java
index 27abc5898..126213ded 100644
--- a/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java
+++ b/src/org/geometerplus/fbreader/network/opds/OPDSXMLReader.java
@@ -90,7 +90,7 @@ public class OPDSXMLReader extends ATOMXMLReader<OPDSFeedMetadata,OPDSEntry> {
 						myState = OPENSEARCH_STARTINDEX;
 					}
 					return false;
-				} else if (ns == XMLNamespaces.FBReaderCatalogMetadata){
+				} else if (ns == XMLNamespaces.FBReaderCatalogMetadata) {
 					if (tag == FBREADER_TAG_VIEW) {
 						myState = FBREADER_VIEW;
 					}
@@ -123,7 +123,7 @@ public class OPDSXMLReader extends ATOMXMLReader<OPDSFeedMetadata,OPDSEntry> {
 					myPriceCurrency = attributes.getValue("currencycode");
 					myState = FEL_PRICE;
 					return false;
-				} if (ns == XMLNamespaces.DublinCoreTerms && tag == DC_TAG_FORMAT) {
+				} else if (ns == XMLNamespaces.DublinCoreTerms && tag == DC_TAG_FORMAT) {
 					myState = FEL_FORMAT;
 					return false;
 				} else {
diff --git a/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java b/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
index 6faff6aed..c07930b6b 100644
--- a/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
+++ b/src/org/geometerplus/zlibrary/core/network/ZLNetworkManager.java
@@ -410,7 +410,7 @@ public class ZLNetworkManager {
 		}
 		HashSet<String> errors = new HashSet<String>();
 		// TODO: implement concurrent execution !!!
-		for (ZLNetworkRequest r: requests) {
+		for (ZLNetworkRequest r : requests) {
 			try {
 				perform(r);
 			} catch (ZLNetworkException e) {
diff --git a/src/org/geometerplus/zlibrary/core/util/MiscUtil.java b/src/org/geometerplus/zlibrary/core/util/MiscUtil.java
index 7f7817301..d29551bba 100644
--- a/src/org/geometerplus/zlibrary/core/util/MiscUtil.java
+++ b/src/org/geometerplus/zlibrary/core/util/MiscUtil.java
@@ -52,7 +52,7 @@ public abstract class MiscUtil {
 				|| !map1.keySet().containsAll(map2.keySet())) {
 			return false;
 		}
-		for (KeyT key: map1.keySet()) {
+		for (KeyT key : map1.keySet()) {
 			final ValueT value1 = map1.get(key);
 			final ValueT value2 = map2.get(key);
 			if (!equals(value1, value2)) {
diff --git a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java b/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
index ecec92e1b..9ff48726f 100644
--- a/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
+++ b/src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
@@ -436,27 +436,27 @@ mainSwitchLabel:
 						case WS_AFTER_START_TAG_NAME:
 							switch (buffer[++i]) {
 								case '>':
-									{
-										String stringTagName = convertToString(strings, tagName);
-										if (tagStackSize == tagStack.length) {
-											tagStack = ZLArrayUtils.createCopy(tagStack, tagStackSize, tagStackSize << 1);
-										}
-										tagStack[tagStackSize++] = stringTagName;
-										if (processNamespaces) {
-											if (currentNamespaceMap != null) {
-												oldNamespaceMap = currentNamespaceMap;
-											}
-											namespaceMapStack.add(currentNamespaceMap);
-										}
-										if (processStartTag(xmlReader, stringTagName, attributes, currentNamespaceMap)) {
-											streamReader.close();
-											return;
-										}
-										currentNamespaceMap = null;
+								{
+									String stringTagName = convertToString(strings, tagName);
+									if (tagStackSize == tagStack.length) {
+										tagStack = ZLArrayUtils.createCopy(tagStack, tagStackSize, tagStackSize << 1);
 									}
+									tagStack[tagStackSize++] = stringTagName;
+									if (processNamespaces) {
+										if (currentNamespaceMap != null) {
+											oldNamespaceMap = currentNamespaceMap;
+										}
+										namespaceMapStack.add(currentNamespaceMap);
+									}
+									if (processStartTag(xmlReader, stringTagName, attributes, currentNamespaceMap)) {
+										streamReader.close();
+										return;
+									}
+									currentNamespaceMap = null;
 									state = TEXT;
 									startPosition = i + 1;
 									break;
+								}
 								case '/':
 									state = SLASH;
 									if (processFullTag(xmlReader, convertToString(strings, tagName), attributes)) {