diff --git a/app/ModuleHandleDock.cpp b/app/ModuleHandleDock.cpp
index 6cb67bb..f95dea1 100644
--- a/app/ModuleHandleDock.cpp
+++ b/app/ModuleHandleDock.cpp
@@ -38,7 +38,7 @@ ModuleHandleDock::ModuleHandleDock( QWidget* parent, PlaYUVerAppModuleIf* module
   // ----------------- Dock definition -----------------
 
   QString labelStr;
-	labelStr.append( moduleIf->m_pcModule->getModuleLongName() );
+  labelStr.append( moduleIf->m_pcModule->getModuleLongName() );
   labelStr.append( " Result:" );
   labelModulueValueLabel = new QLabel( labelStr );
   labelModulueValueLabel->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
diff --git a/app/ModulesHandle.cpp b/app/ModulesHandle.cpp
index d4413c7..67d412e 100644
--- a/app/ModulesHandle.cpp
+++ b/app/ModulesHandle.cpp
@@ -129,12 +129,12 @@ Void ModulesHandle::buildMenu()
       }
     }
 
-		currAction = new QAction( pcCurrModuleIf->getModuleLongName(), parent() );
-		QString moduleTooltip = pcCurrModuleIf->m_pchModuleTooltip;
-		if( pcCurrModuleIf->m_uiNumberOfFrames > 1 )
-			moduleTooltip += QString(" | Requires %1 frames").arg( pcCurrModuleIf->m_uiNumberOfFrames );
+    currAction = new QAction( pcCurrModuleIf->getModuleLongName(), parent() );
+    QString moduleTooltip = pcCurrModuleIf->m_pchModuleTooltip;
+    if( pcCurrModuleIf->m_uiNumberOfFrames > 1 )
+      moduleTooltip += QString( " | Requires %1 frames" ).arg( pcCurrModuleIf->m_uiNumberOfFrames );
 
-		currAction->setStatusTip( moduleTooltip );
+    currAction->setStatusTip( moduleTooltip );
     currAction->setData( ModuleIfInternalName );
     currAction->setCheckable( false );
     connect( currAction, SIGNAL( triggered() ), this, SLOT( activateModule() ) );
@@ -161,18 +161,18 @@ Void ModulesHandle::updateMenus()
 {
   VideoSubWindow* pcSubWindow = qobject_cast<VideoSubWindow*>( m_pcMainWindowManager->activeSubWindow() );
   Bool hasSubWindow = pcSubWindow ? true : false;
-	QAction* currModuleAction;
+  QAction* currModuleAction;
 
-	for( Int i = 0; i < m_arrayModulesActions.size(); i++ )
-	{
-		currModuleAction = m_arrayModulesActions.at( i );
-		//currModuleAction->setEnabled( hasSubWindow );
-		currModuleAction->setChecked( false );
-	}
-	//for( Int i = 0; i < m_pcModulesSubMenuList.size(); i++ )
-	//{
-	//	m_pcModulesSubMenuList.at( i )->setEnabled( hasSubWindow );
-	//}
+  for( Int i = 0; i < m_arrayModulesActions.size(); i++ )
+  {
+    currModuleAction = m_arrayModulesActions.at( i );
+    //currModuleAction->setEnabled( hasSubWindow );
+    currModuleAction->setChecked( false );
+  }
+  //for( Int i = 0; i < m_pcModulesSubMenuList.size(); i++ )
+  //{
+  //	m_pcModulesSubMenuList.at( i )->setEnabled( hasSubWindow );
+  //}
 
   for( Int i = 0; i < m_arrayActions.size(); i++ )
   {
@@ -191,11 +191,11 @@ Void ModulesHandle::updateMenus()
       m_arrayActions[APPLY_ALL_ACT]->setEnabled( true );
       m_arrayActions[SWAP_FRAMES_ACT]->setEnabled( true );
     }
-		for( Int i = 0; i < apcCurrentModule.size(); i++ )
-		{
-			currModuleAction = apcCurrentModule.at( i )->m_pcModuleAction;
-			currModuleAction->setChecked( true );
-		}
+    for( Int i = 0; i < apcCurrentModule.size(); i++ )
+    {
+      currModuleAction = apcCurrentModule.at( i )->m_pcModuleAction;
+      currModuleAction->setChecked( true );
+    }
   }
 }
 
diff --git a/lib/PlaYUVerFrame.cpp b/lib/PlaYUVerFrame.cpp
index 3b6be3b..cee5ada 100644
--- a/lib/PlaYUVerFrame.cpp
+++ b/lib/PlaYUVerFrame.cpp
@@ -172,7 +172,7 @@ struct PlaYUVerFramePrivate
     m_uiHeight = height;
     m_iPixelFormat = pel_format;
     m_iNumberChannels = 3;
-    m_uiBitsPel = bitsPixel > 8 ? bitsPixel : 8;
+    m_uiBitsPel = bitsPixel < 8 ? 8 : bitsPixel;
     m_uiHalfPelValue = 1 << ( m_uiBitsPel - 1 );
 
     if( m_uiWidth == 0 || m_uiHeight == 0 || m_iPixelFormat == -1 || bitsPixel > 16 )
diff --git a/lib/PlaYUVerModuleIf.h b/lib/PlaYUVerModuleIf.h
index d722288..7cf42ef 100644
--- a/lib/PlaYUVerModuleIf.h
+++ b/lib/PlaYUVerModuleIf.h
@@ -126,7 +126,7 @@ public:
   const Char* m_pchModuleCategory;
   const Char* m_pchModuleName;
   const Char* m_pchModuleTooltip;
-	const Char* m_pchModuleLongName;
+  const Char* m_pchModuleLongName;
 
   //! Number of frames
   enum Module_NumberOfFrames m_uiNumberOfFrames;
@@ -139,16 +139,16 @@ public:
   {
     m_iModuleAPI = MODULE_API_1;
     m_uiModuleRequirements = MODULE_REQUIRES_NOTHING;
-		m_pchModuleLongName = NULL;
+    m_pchModuleLongName = NULL;
   }
   virtual ~PlaYUVerModuleIf() {}
   virtual void Delete() = 0;
   virtual Void destroy() = 0;
 
-	const Char* getModuleLongName()
-	{
-		return m_pchModuleLongName ? m_pchModuleLongName : m_pchModuleName;
-	}
+  const Char* getModuleLongName()
+  {
+    return m_pchModuleLongName ? m_pchModuleLongName : m_pchModuleName;
+  }
 
   /**
    * Module API version 1
diff --git a/modules/AbsoluteFrameDifference.cpp b/modules/AbsoluteFrameDifference.cpp
index f2da939..f350ddc 100644
--- a/modules/AbsoluteFrameDifference.cpp
+++ b/modules/AbsoluteFrameDifference.cpp
@@ -32,8 +32,8 @@ AbsoluteFrameDifference::AbsoluteFrameDifference()
   m_iModuleType = FRAME_PROCESSING_MODULE;                 // Apply module to the frames or to
                                                            // the whole sequence.
   m_pchModuleCategory = "Measurements";                    // Category (sub-menu)
-	m_pchModuleName = "AbsoluteFrameDifference";             // Name (no spaces)
-	m_pchModuleLongName = "Absolute Difference";						 // Long Name
+  m_pchModuleName = "AbsoluteFrameDifference";             // Name (no spaces)
+  m_pchModuleLongName = "Absolute Difference";             // Long Name
   m_pchModuleTooltip = "Measure the absolute difference "  // Description
                        "between two images (Y plane), e. g., abs( Y1 - Y2 )";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;      // Number of Frames required
diff --git a/modules/DisparityStereoBM.cpp b/modules/DisparityStereoBM.cpp
index 4a536c7..61c8f1b 100644
--- a/modules/DisparityStereoBM.cpp
+++ b/modules/DisparityStereoBM.cpp
@@ -32,7 +32,7 @@ DisparityStereoBM::DisparityStereoBM()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Stereo";
   m_pchModuleName = "Disparity-BM";
-	m_pchModuleLongName = "Block macth based disparity";
+  m_pchModuleLongName = "Block macth based disparity";
   m_pchModuleTooltip = "Measure the disparity between two images using the "
                        "Stereo BM method (OpenCV)";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
diff --git a/modules/DisparityStereoSGBM.cpp b/modules/DisparityStereoSGBM.cpp
index 60eba37..8afa443 100644
--- a/modules/DisparityStereoSGBM.cpp
+++ b/modules/DisparityStereoSGBM.cpp
@@ -32,7 +32,7 @@ DisparityStereoSGBM::DisparityStereoSGBM()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Stereo";
   m_pchModuleName = "Disparity-SGBM";
-	m_pchModuleName = "SGBM based disparity";
+  m_pchModuleName = "SGBM based disparity";
   m_pchModuleTooltip = "Measure the disparity between two images using the "
                        "Stereo SGBM method (OpenCV)";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
diff --git a/modules/EightBitsSampling.cpp b/modules/EightBitsSampling.cpp
index 069dbc7..9d34c4a 100644
--- a/modules/EightBitsSampling.cpp
+++ b/modules/EightBitsSampling.cpp
@@ -31,7 +31,7 @@ EightBitsSampling::EightBitsSampling()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Conversions";
   m_pchModuleName = "EightBitsSampling";
-	m_pchModuleLongName = "8 bit sub-sampling";
+  m_pchModuleLongName = "8 bit sub-sampling";
   m_pchModuleTooltip = "Sub-sampling frame to 8bpp";
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
   m_uiModuleRequirements = MODULE_REQUIRES_NOTHING;
diff --git a/modules/FilterComponent.cpp b/modules/FilterComponent.cpp
index 14f3e23..6f59019 100644
--- a/modules/FilterComponent.cpp
+++ b/modules/FilterComponent.cpp
@@ -28,12 +28,12 @@
 
 FilterComponentModule::FilterComponentModule()
 {
-	/* Module Definition */
-	m_iModuleAPI = MODULE_API_2;
-	m_iModuleType = FRAME_PROCESSING_MODULE;
-	m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
-	m_uiModuleRequirements = MODULE_REQUIRES_NOTHING;
-	m_pchModuleCategory = "Filtering";
+  /* Module Definition */
+  m_iModuleAPI = MODULE_API_2;
+  m_iModuleType = FRAME_PROCESSING_MODULE;
+  m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
+  m_uiModuleRequirements = MODULE_REQUIRES_NOTHING;
+  m_pchModuleCategory = "Filtering";
 
   m_pcFilteredFrame = NULL;
 }
@@ -64,8 +64,8 @@ Void FilterComponentModule::destroy()
 FilterComponentLuma::FilterComponentLuma()
 {
   /* Module Definition */
-	m_pchModuleName = "FilterLuma";                       // Name
-	m_pchModuleLongName = "Luma Component";               // Name on the Gui
+  m_pchModuleName = "FilterLuma";                       // Name
+  m_pchModuleLongName = "Luma Component";               // Name on the Gui
   m_pchModuleTooltip = "Filter Y matrix of YUV frame";  // Description
 }
 
@@ -81,8 +81,8 @@ PlaYUVerFrame* FilterComponentLuma::process( std::vector<PlaYUVerFrame*> apcFram
 
 FilterComponentChromaU::FilterComponentChromaU()
 {
-	m_pchModuleName = "FilterChromaU";
-	m_pchModuleLongName = "U/Cb Component";
+  m_pchModuleName = "FilterChromaU";
+  m_pchModuleLongName = "U/Cb Component";
   m_pchModuleTooltip = "Filter U matrix of YUV frame";
 }
 
@@ -104,9 +104,9 @@ PlaYUVerFrame* FilterComponentChromaU::process( std::vector<PlaYUVerFrame*> apcF
 FilterComponentChromaV::FilterComponentChromaV()
 {
   /* Module Definition */
-	m_pchModuleName = "FilterChromaV";
-	m_pchModuleLongName = "V/Cr Component";
-	m_pchModuleTooltip = "Filter V matrix of YUV frame";
+  m_pchModuleName = "FilterChromaV";
+  m_pchModuleLongName = "V/Cr Component";
+  m_pchModuleTooltip = "Filter V matrix of YUV frame";
 }
 
 Bool FilterComponentChromaV::create( std::vector<PlaYUVerFrame*> apcFrameList )
diff --git a/modules/FrameBinarization.cpp b/modules/FrameBinarization.cpp
index adbcc38..1f7fe6c 100644
--- a/modules/FrameBinarization.cpp
+++ b/modules/FrameBinarization.cpp
@@ -29,7 +29,7 @@ FrameBinarization::FrameBinarization()
   /* Module Definition */
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Utilities";
-	m_pchModuleLongName = "Binarization";
+  m_pchModuleLongName = "Binarization";
   m_pchModuleName = "FrameBinarization";
   m_pchModuleTooltip = "Binarize frame";
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
diff --git a/modules/FrameCrop.cpp b/modules/FrameCrop.cpp
index 9fd7578..a2161d1 100644
--- a/modules/FrameCrop.cpp
+++ b/modules/FrameCrop.cpp
@@ -29,7 +29,7 @@ FrameCrop::FrameCrop()
   /* Module Definition */
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Utilities";
-	m_pchModuleLongName = "Crop";
+  m_pchModuleLongName = "Crop";
   m_pchModuleName = "FrameCrop";
   m_pchModuleTooltip = "Crop a region of a frame";
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp
index 227d3b1..5f8a446 100644
--- a/modules/FrameDifference.cpp
+++ b/modules/FrameDifference.cpp
@@ -31,7 +31,7 @@ FrameDifference::FrameDifference()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Measurements";
   m_pchModuleName = "FrameDifference";
-	m_pchModuleName = "Difference";
+  m_pchModuleName = "Difference";
   m_pchModuleTooltip = "Measure the difference between two images (Y plane),  "
                        "Y1 - Y2, with max absolute diff of 128";
   m_uiModuleRequirements = MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
diff --git a/modules/FrameMask.cpp b/modules/FrameMask.cpp
index c5b6940..e205817 100644
--- a/modules/FrameMask.cpp
+++ b/modules/FrameMask.cpp
@@ -30,7 +30,7 @@ FrameMask::FrameMask()
   m_iModuleAPI = MODULE_API_2;
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Utilities";
-	m_pchModuleLongName = "Apply mask";
+  m_pchModuleLongName = "Apply mask";
   m_pchModuleName = "FrameMask";
   m_pchModuleTooltip = "Applies a mask to the selected image (first image)";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
diff --git a/modules/FrameRotate.cpp b/modules/FrameRotate.cpp
index fccd6e8..67ad477 100644
--- a/modules/FrameRotate.cpp
+++ b/modules/FrameRotate.cpp
@@ -30,7 +30,7 @@ FrameRotate::FrameRotate()
   m_iModuleAPI = MODULE_API_2;
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Utilities";
-	m_pchModuleLongName = "Rotation";
+  m_pchModuleLongName = "Rotation";
   m_pchModuleName = "FrameRotate";
   m_pchModuleTooltip = "Rotates frame";
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
diff --git a/modules/FrameShift.cpp b/modules/FrameShift.cpp
index 6d4d1d4..fc97593 100644
--- a/modules/FrameShift.cpp
+++ b/modules/FrameShift.cpp
@@ -30,9 +30,9 @@ FrameShift::FrameShift()
   m_iModuleAPI = MODULE_API_2;
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Utilities";
-	m_pchModuleLongName = "Pixel Shift";
+  m_pchModuleLongName = "Pixel Shift";
   m_pchModuleName = "FrameShift";
-	m_pchModuleTooltip = "Shift frame horizontal and vertical";
+  m_pchModuleTooltip = "Shift frame horizontal and vertical";
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
   m_uiModuleRequirements = MODULE_REQUIRES_OPTIONS | MODULE_USES_KEYS;
 
diff --git a/modules/InterFrameVariance.cpp b/modules/InterFrameVariance.cpp
index c11d68c..32ad36a 100644
--- a/modules/InterFrameVariance.cpp
+++ b/modules/InterFrameVariance.cpp
@@ -35,7 +35,7 @@ InterFrameVariance::InterFrameVariance()
                                             // the whole sequence.
   m_pchModuleCategory = "Measurements";     // Category (sub-menu)
   m_pchModuleName = "InterFrameVariance";   // Name
-	m_pchModuleLongName = "Variance across frames";
+  m_pchModuleLongName = "Variance across frames";
   m_pchModuleTooltip = "Measure the variance across several frames";
   m_uiNumberOfFrames = MODULE_REQUIRES_SEVERAL_FRAMES;  // Number of Frames required (This module
                                                         // allows a variable number of inputs)
diff --git a/modules/LumaAverage.cpp b/modules/LumaAverage.cpp
index 81142fd..bc19b3d 100644
--- a/modules/LumaAverage.cpp
+++ b/modules/LumaAverage.cpp
@@ -32,7 +32,7 @@ LumaAverage::LumaAverage()
                                                                  // Currently only support for frame
   m_pchModuleCategory = "Measurements";                          // Category (sub-menu)
   m_pchModuleName = "LumaAverage";                               // Name
-	m_pchModuleLongName = "Average";                               // Long name
+  m_pchModuleLongName = "Average";                               // Long name
   m_pchModuleTooltip = "Measure the average of luma component";  // Description
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;                // Number of Frames required
                                                                  // (ONE_FRAME, TWO_FRAMES,
diff --git a/modules/MeasureOpticalFlowDualTVL1.cpp b/modules/MeasureOpticalFlowDualTVL1.cpp
index 9474097..2d7e2c8 100644
--- a/modules/MeasureOpticalFlowDualTVL1.cpp
+++ b/modules/MeasureOpticalFlowDualTVL1.cpp
@@ -38,7 +38,7 @@ MeasureOpticalFlowDualTVL1::MeasureOpticalFlowDualTVL1()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Measurements";
   m_pchModuleName = "MeasureOpticalFlowDualTVL1";
-	m_pchModuleLongName = "Optical flow based on DualTVL1";
+  m_pchModuleLongName = "Optical flow based on DualTVL1";
   m_pchModuleTooltip = "Measure optical flow";
   m_uiNumberOfFrames = MODULE_REQUIRES_TWO_FRAMES;
   m_uiModuleRequirements = MODULE_REQUIRES_SKIP_WHILE_PLAY | MODULE_REQUIRES_NEW_WINDOW | MODULE_REQUIRES_OPTIONS;
diff --git a/modules/OpticalFlow.cpp b/modules/OpticalFlow.cpp
index 74d215b..84927f6 100644
--- a/modules/OpticalFlow.cpp
+++ b/modules/OpticalFlow.cpp
@@ -156,8 +156,8 @@ Void OpticalFlowModule::destroy()
 OpticalFlowDualTVL1::OpticalFlowDualTVL1()
 {
   /* Module Definition */
-	m_pchModuleName = "OpticalFlowDualTVL1";
-	m_pchModuleLongName = "Dual TVL1";
+  m_pchModuleName = "OpticalFlowDualTVL1";
+  m_pchModuleLongName = "Dual TVL1";
   m_pchModuleTooltip = "Measure optical flow using DualTVL1 method";
 }
 
@@ -174,7 +174,7 @@ OpticalFlowSparseToDense::OpticalFlowSparseToDense()
 {
   /* Module Definition */
   m_pchModuleName = "OpticalFlowSparseToDense";
-	m_pchModuleLongName = "Sparse to dense";
+  m_pchModuleLongName = "Sparse to dense";
   m_pchModuleTooltip = "Measure optical flow using SparseToDense method";
 }
 
@@ -191,7 +191,7 @@ OpticalFlowFarneback::OpticalFlowFarneback()
 {
   /* Module Definition */
   m_pchModuleName = "OpticalFlowFarneback";
-	m_pchModuleLongName = "Farneback";
+  m_pchModuleLongName = "Farneback";
   m_pchModuleTooltip = "Measure optical flow using Farneback method";
 }
 
@@ -208,7 +208,7 @@ OpticalDeepFlow::OpticalDeepFlow()
 {
   /* Module Definition */
   m_pchModuleName = "OpticalDeepFlow";
-	m_pchModuleLongName = "Deep flow";
+  m_pchModuleLongName = "Deep flow";
   m_pchModuleTooltip = "Measure optical flow using Farneback method";
 }
 
diff --git a/modules/SetChromaHalfScale.cpp b/modules/SetChromaHalfScale.cpp
index c6cec97..1f84321 100644
--- a/modules/SetChromaHalfScale.cpp
+++ b/modules/SetChromaHalfScale.cpp
@@ -30,7 +30,7 @@ SetChromaHalfScale::SetChromaHalfScale()
   m_iModuleType = FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Conversions";
   m_pchModuleName = "SetChromaHalfScale";
-	m_pchModuleLongName = "Half scale chroma";
+  m_pchModuleLongName = "Half scale chroma";
   m_pchModuleTooltip = "Copy frame only keeping luma component";
   m_uiNumberOfFrames = MODULE_REQUIRES_ONE_FRAME;
   m_uiModuleRequirements = MODULE_REQUIRES_NOTHING;
diff --git a/modules/WeightedPSNR.cpp b/modules/WeightedPSNR.cpp
index 64fd4ca..c3c7032 100644
--- a/modules/WeightedPSNR.cpp
+++ b/modules/WeightedPSNR.cpp
@@ -33,7 +33,7 @@ WeightedPSNR::WeightedPSNR()
   m_iModuleType = FRAME_MEASUREMENT_MODULE;
   m_pchModuleCategory = "Quality";
   m_pchModuleName = "WeightedPSNR";
-	m_pchModuleLongName = "Weighted PSNR";
+  m_pchModuleLongName = "Weighted PSNR";
   m_pchModuleTooltip = "Measure the weighted PSNR between two images";
   m_uiModuleRequirements = MODULE_REQUIRES_OPTIONS;
   m_uiNumberOfFrames = MODULE_REQUIRES_THREE_FRAMES;