diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
index c13342fc5..f497d66c6 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidActivity.java
@@ -205,14 +205,14 @@ public abstract class ZLAndroidActivity extends Activity {
 
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		View view = findViewById(R.id.main_view);
-		return ((view != null) && view.onKeyDown(keyCode, event)) || super.onKeyDown(keyCode, event);
+		final View view = findViewById(R.id.main_view);
+		return (view != null && view.onKeyDown(keyCode, event)) || super.onKeyDown(keyCode, event);
 	}
 
 	@Override
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		View view = findViewById(R.id.main_view);
-		return ((view != null) && view.onKeyUp(keyCode, event)) || super.onKeyUp(keyCode, event);
+		final View view = findViewById(R.id.main_view);
+		return (view != null && view.onKeyUp(keyCode, event)) || super.onKeyUp(keyCode, event);
 	}
 
 	BroadcastReceiver myBatteryInfoReceiver = new BroadcastReceiver() {
diff --git a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
index bfdacf4d2..4d873a450 100644
--- a/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
+++ b/src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
@@ -75,7 +75,6 @@ public final class ZLAndroidLibrary extends ZLibrary {
 
 	private ZLAndroidActivity myActivity;
 	private final Application myApplication;
-	private ZLAndroidWidget myWidget;
 
 	ZLAndroidLibrary(Application application) {
 		myApplication = application;
@@ -83,11 +82,10 @@ public final class ZLAndroidLibrary extends ZLibrary {
 
 	void setActivity(ZLAndroidActivity activity) {
 		myActivity = activity;
-		myWidget = null;
 	}
 
 	public void finish() {
-		if ((myActivity != null) && !myActivity.isFinishing()) {
+		if (myActivity != null && !myActivity.isFinishing()) {
 			myActivity.finish();
 		}
 	}
@@ -97,10 +95,7 @@ public final class ZLAndroidLibrary extends ZLibrary {
 	}
 
 	public ZLAndroidWidget getWidget() {
-		if (myWidget == null) {
-			myWidget = (ZLAndroidWidget)myActivity.findViewById(R.id.main_view);
-		}
-		return myWidget;
+		return (ZLAndroidWidget)myActivity.findViewById(R.id.main_view);
 	}
 
 	@Override