diff --git a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java
index 848b13588..6192b8d79 100644
--- a/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java
+++ b/src/org/geometerplus/android/fbreader/library/SQLiteBooksDatabase.java
@@ -306,6 +306,7 @@ public final class SQLiteBooksDatabase extends BooksDatabase {
 	}
 
 	private SQLiteStatement myInsertBookInfoStatement;
+	@Override
 	protected long insertBookInfo(ZLFile file, String encoding, String language, String title) {
 		if (myInsertBookInfoStatement == null) {
 			myInsertBookInfoStatement = myDatabase.compileStatement(
diff --git a/src/org/geometerplus/fbreader/bookmodel/BookReader.java b/src/org/geometerplus/fbreader/bookmodel/BookReader.java
index 813d4ca56..490126423 100644
--- a/src/org/geometerplus/fbreader/bookmodel/BookReader.java
+++ b/src/org/geometerplus/fbreader/bookmodel/BookReader.java
@@ -310,7 +310,7 @@ public class BookReader {
 	}
 
 	public final void addContentsData(char[] data, int offset, int length) {
-		if ((length != 0) && (myCurrentContentsTree != null)) {
+		if (length != 0 && myCurrentContentsTree != null) {
 			myContentsBuffer.append(data, offset, length);
 		}
 	}
diff --git a/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
index 75359bcb7..a9ae557d0 100644
--- a/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
+++ b/src/org/geometerplus/fbreader/formats/fb2/FB2Plugin.java
@@ -26,7 +26,7 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.bookmodel.BookReadingException;
 import org.geometerplus.fbreader.library.Book;
-import org.geometerplus.fbreader.formats.*;
+import org.geometerplus.fbreader.formats.JavaFormatPlugin;
 
 public class FB2Plugin extends JavaFormatPlugin {
 	public FB2Plugin() {
diff --git a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
index dd4b46d95..f74119a3c 100644
--- a/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
+++ b/src/org/geometerplus/fbreader/formats/oeb/OEBPlugin.java
@@ -26,7 +26,7 @@ import org.geometerplus.zlibrary.core.image.ZLImage;
 import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.bookmodel.BookReadingException;
 import org.geometerplus.fbreader.library.Book;
-import org.geometerplus.fbreader.formats.*;
+import org.geometerplus.fbreader.formats.JavaFormatPlugin;
 
 public class OEBPlugin extends JavaFormatPlugin {
 	public OEBPlugin() {
@@ -60,7 +60,7 @@ public class OEBPlugin extends JavaFormatPlugin {
 	public void readMetaInfo(Book book) throws BookReadingException {
 		new OEBMetaInfoReader(book).readMetaInfo(getOpfFile(book.File));
 	}
-	
+
 	@Override
 	public void readModel(BookModel model) throws BookReadingException {
 		model.Book.File.setCached(true);
@@ -73,7 +73,7 @@ public class OEBPlugin extends JavaFormatPlugin {
 			return new OEBCoverReader().readCover(getOpfFile(file));
 		} catch (BookReadingException e) {
 			return null;
-		} 
+		}
 	}
 
 	@Override
@@ -82,7 +82,7 @@ public class OEBPlugin extends JavaFormatPlugin {
 			return new OEBAnnotationReader().readAnnotation(getOpfFile(file));
 		} catch (BookReadingException e) {
 			return null;
-		} 
+		}
 	}
 
 	@Override
diff --git a/src/org/geometerplus/fbreader/library/Library.java b/src/org/geometerplus/fbreader/library/Library.java
index 752a02c2e..32db107b7 100644
--- a/src/org/geometerplus/fbreader/library/Library.java
+++ b/src/org/geometerplus/fbreader/library/Library.java
@@ -292,7 +292,7 @@ public final class Library extends AbstractLibrary {
 		}
 
 		// Step 1: set myDoGroupTitlesByFirstLetter value,
-        // add "existing" books into recent and favorites lists
+		// add "existing" books into recent and favorites lists
 		if (savedBooksByFileId.size() > 10) {
 			final HashSet<String> letterSet = new HashSet<String>();
 			for (Book book : savedBooksByFileId.values()) {
diff --git a/src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java b/src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
index 177d1757c..035f5c302 100644
--- a/src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
+++ b/src/org/geometerplus/zlibrary/text/model/ZLTextStyleEntry.java
@@ -34,7 +34,7 @@ public final class ZLTextStyleEntry {
 
 	short getMask() {
 		return myMask;
-	};
+	}
 	
 	public boolean isLeftIndentSupported() {
 		return (myMask & SUPPORTS_LEFT_INDENT) == SUPPORTS_LEFT_INDENT;
@@ -42,7 +42,7 @@ public final class ZLTextStyleEntry {
 	
 	public short getLeftIndent() {
 		return myLeftIndent;
-	};
+	}
 	
 	public void setLeftIndent(short leftIndent) {
 		myMask |= SUPPORTS_LEFT_INDENT;