diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
index 9fe606846c78..8813e70d823b 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XQuickEvaluateHandler.java
@@ -54,12 +54,18 @@ public class XQuickEvaluateHandler extends QuickEvaluateHandler {
   @Override
   public AbstractValueHint createValueHint(@NotNull final Project project, @NotNull final Editor editor, @NotNull final Point point, final ValueHintType type) {
     final XDebugSession session = XDebuggerManager.getInstance(project).getCurrentSession();
-    if (session == null) return null;
+    if (session == null) {
+      return null;
+    }
 
     XStackFrame stackFrame = session.getCurrentStackFrame();
-    if (stackFrame == null) return null;
+    if (stackFrame == null) {
+      return null;
+    }
     final XDebuggerEvaluator evaluator = stackFrame.getEvaluator();
-    if (evaluator == null) return null;
+    if (evaluator == null) {
+      return null;
+    }
 
     return PsiDocumentManager.getInstance(project).commitAndRunReadAction(new Computable<XValueHint>() {
       @Override
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
index d42b35140d3e..e7694a833789 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
@@ -20,7 +20,6 @@ import com.intellij.codeInsight.hint.HintManagerImpl;
 import com.intellij.codeInsight.hint.HintUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.editor.event.EditorMouseEvent;
 import com.intellij.openapi.editor.markup.*;
 import com.intellij.openapi.project.Project;
@@ -106,8 +105,7 @@ public abstract class AbstractValueHint {
   }
 
   public static int calculateOffset(@NotNull Editor editor, @NotNull Point point) {
-    LogicalPosition pos = editor.xyToLogicalPosition(point);
-    return editor.logicalPositionToOffset(pos);
+    return editor.logicalPositionToOffset(editor.xyToLogicalPosition(point));
   }
 
   public void hideHint() {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueLookupManager.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueLookupManager.java
index 25c3ed526be2..6a0cffdc335b 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueLookupManager.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/ValueLookupManager.java
@@ -57,10 +57,14 @@ public class ValueLookupManager implements EditorMouseMotionListener {
 
   @Override
   public void mouseMoved(EditorMouseEvent e) {
-    if (e.isConsumed()) return;
+    if (e.isConsumed()) {
+      return;
+    }
 
     Editor editor = e.getEditor();
-    if (editor.getProject() != null && editor.getProject() != myProject) return;
+    if (editor.getProject() != null && editor.getProject() != myProject) {
+      return;
+    }
 
     Point point = e.getMouseEvent().getPoint();
     if (myRequest != null && !myRequest.isKeepHint(editor, point)) {
@@ -92,7 +96,7 @@ public class ValueLookupManager implements EditorMouseMotionListener {
   }
 
   public void hideHint() {
-    if(myRequest != null) {
+    if (myRequest != null) {
       myRequest.hideHint();
       myRequest = null;
     }
@@ -100,7 +104,9 @@ public class ValueLookupManager implements EditorMouseMotionListener {
 
   public void showHint(final QuickEvaluateHandler handler, Editor editor, Point point, ValueHintType type) {
     myAlarm.cancelAllRequests();
-    if (editor.isDisposed() || !handler.canShowHint(myProject)) return;
+    if (editor.isDisposed() || !handler.canShowHint(myProject)) {
+      return;
+    }
 
     final AbstractValueHint request = handler.createValueHint(myProject, editor, point, type);
     if (request != null) {
@@ -108,8 +114,12 @@ public class ValueLookupManager implements EditorMouseMotionListener {
         return;
       }
 
-      if (!request.canShowHint()) return;
-      if (myRequest != null && myRequest.isInsideHint(editor, point)) return;
+      if (!request.canShowHint()) {
+        return;
+      }
+      if (myRequest != null && myRequest.isInsideHint(editor, point)) {
+        return;
+      }
 
       hideHint();