diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 6d78f920..bc4c0f6b 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -63,7 +63,6 @@ Notepad_plus::Notepad_plus(): Window(), _mainWindowStatus(0), _pDocTab(NULL), _p
 	
 	TiXmlDocument *toolIconsDocRoot = (NppParameters::getInstance())->getToolIcons();
     
-
 	if (toolIconsDocRoot)
 	{
         _toolBar.initTheme(toolIconsDocRoot);
diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
index b165245f..b9b5987c 100644
--- a/PowerEditor/src/Notepad_plus.h
+++ b/PowerEditor/src/Notepad_plus.h
@@ -115,10 +115,6 @@
 #define MENU 0x01
 #define TOOLBAR 0x02
 
-namespace Translator {
-
-}
-
 #define URL_REG_EXPR "[A-Za-z]+://[A-Za-z0-9_\\-\\+~.:?&@=/%#,;\\{\\}\\(\\)\\[\\]\\|\\*\\!\\\\]+"
 
 enum FileTransferMode {
@@ -292,7 +288,6 @@ private:
 	AutoCompletion _autoCompleteSub;	//each Scintilla has its own autoComplete
 
 	SmartHighlighter _smartHighlighter;
-	//TiXmlNode *_toolIcons;
     NativeLangSpeaker _nativeLangSpeaker;
     DocTabView _mainDocTab;
     DocTabView _subDocTab;
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 16e0c354..0faf27d9 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -905,10 +905,12 @@ void Notepad_plus::command(int id)
 
 		case IDM_VIEW_SYNSCROLLV:
 		{
-			_syncInfo._isSynScollV = !_syncInfo._isSynScollV;
-			checkMenuItem(IDM_VIEW_SYNSCROLLV, _syncInfo._isSynScollV);
-			_toolBar.setCheck(IDM_VIEW_SYNSCROLLV, _syncInfo._isSynScollV);
+            bool isSynScollV = !_syncInfo._isSynScollV;
+			
+			checkMenuItem(IDM_VIEW_SYNSCROLLV, isSynScollV);
+			_toolBar.setCheck(IDM_VIEW_SYNSCROLLV, isSynScollV);
 
+            _syncInfo._isSynScollV = isSynScollV;
 			if (_syncInfo._isSynScollV)
 			{
 				int mainCurrentLine = _mainEditView.execute(SCI_GETFIRSTVISIBLELINE);
@@ -921,10 +923,11 @@ void Notepad_plus::command(int id)
 
 		case IDM_VIEW_SYNSCROLLH:
 		{
-			_syncInfo._isSynScollH = !_syncInfo._isSynScollH;
-			checkMenuItem(IDM_VIEW_SYNSCROLLH, _syncInfo._isSynScollH);
-			_toolBar.setCheck(IDM_VIEW_SYNSCROLLH, _syncInfo._isSynScollH);
+            bool isSynScollH = !_syncInfo._isSynScollH;
+			checkMenuItem(IDM_VIEW_SYNSCROLLH, isSynScollH);
+			_toolBar.setCheck(IDM_VIEW_SYNSCROLLH, isSynScollH);
 
+            _syncInfo._isSynScollH = isSynScollH;
 			if (_syncInfo._isSynScollH)
 			{
 				int mxoffset = _mainEditView.execute(SCI_GETXOFFSET);