diff --git a/src/fbutton.cpp b/src/fbutton.cpp
index 975aa31c..8118358a 100644
--- a/src/fbutton.cpp
+++ b/src/fbutton.cpp
@@ -168,8 +168,8 @@ void FButton::draw()
     if ( is_Flat )
       clearFlatBorder();
     clearShadow();
-    setColor ( parentWidget()->getForegroundColor(),
-               parentWidget()->getBackgroundColor() );
+    setColor ( parentWidget()->getForegroundColor()
+             , parentWidget()->getBackgroundColor() );
     for (int y=1; y <= height; y++)
     {
       gotoxy (xpos+xmin-1, ypos+ymin-2+y);
@@ -252,8 +252,8 @@ void FButton::draw()
      && (is_Flat || ! hasShadow() || isMonochron()) )
   {
     // clear the right █ from button down
-    setColor ( parentWidget()->getForegroundColor(),
-               parentWidget()->getBackgroundColor() );
+    setColor ( parentWidget()->getForegroundColor()
+             , parentWidget()->getBackgroundColor() );
     for (int y=1; y <= height; y++)
     {
       if ( isMonochron() )
@@ -283,11 +283,11 @@ void FButton::draw()
     print (space); // █
 
   if ( hotkeypos == -1 )
-    setCursorPos ( xpos+xmin-1+margin+i,
-                   ypos+ymin-1+j ); // first character
+    setCursorPos ( xpos+xmin-1+margin+i
+                 , ypos+ymin-1+j ); // first character
   else
-    setCursorPos ( xpos+xmin-1+margin+i+hotkeypos,
-                   ypos+ymin-1+j ); // hotkey
+    setCursorPos ( xpos+xmin-1+margin+i+hotkeypos
+                 , ypos+ymin-1+j ); // hotkey
 
   if ( isMonochron() && is_ActiveFocus )
     setBold();
@@ -337,8 +337,8 @@ void FButton::draw()
 
   if ( is_NonFlatShadow && ! button_down )
   {
-    setColor ( parentWidget()->getForegroundColor(),
-               parentWidget()->getBackgroundColor() );
+    setColor ( parentWidget()->getForegroundColor()
+             , parentWidget()->getBackgroundColor() );
     print(' '); // restore background after button down
     drawShadow();
   }
diff --git a/src/fbuttongroup.cpp b/src/fbuttongroup.cpp
index 8fd608c6..d8b48244 100644
--- a/src/fbuttongroup.cpp
+++ b/src/fbuttongroup.cpp
@@ -71,8 +71,8 @@ void FButtonGroup::init()
 //----------------------------------------------------------------------
 bool FButtonGroup::isRadioButton(FToggleButton* button) const
 {
-  return bool ( strcmp ( button->getClassName(),
-                         const_cast<char*>("FRadioButton") ) == 0 );
+  return bool ( strcmp ( button->getClassName()
+                       , const_cast<char*>("FRadioButton") ) == 0 );
 }
 
 //----------------------------------------------------------------------
diff --git a/src/fcheckbox.cpp b/src/fcheckbox.cpp
index bc19cf74..c36f3bf6 100644
--- a/src/fcheckbox.cpp
+++ b/src/fcheckbox.cpp
@@ -10,14 +10,15 @@
 
 // constructor and destructor
 //----------------------------------------------------------------------
-FCheckBox::FCheckBox(FWidget* parent) : FToggleButton(parent)
+FCheckBox::FCheckBox(FWidget* parent)
+  : FToggleButton(parent)
 {
   init();
 }
 
 //----------------------------------------------------------------------
-FCheckBox::FCheckBox ( const FString& txt,
-                       FWidget* parent ) : FToggleButton(txt, parent)
+FCheckBox::FCheckBox (const FString& txt, FWidget* parent)
+  : FToggleButton(txt, parent)
 {
   init();
 }
diff --git a/src/flistbox.cpp b/src/flistbox.cpp
index a647cbbf..07b74286 100644
--- a/src/flistbox.cpp
+++ b/src/flistbox.cpp
@@ -388,8 +388,8 @@ void FListBox::drawList()
       const wchar_t* element_str;
       uInt i, len;
       element = data[y+uInt(yoffset)].getText()
-                                     .mid( uInt(1+xoffset),
-                                           uInt(width-nf_offset-4) );
+                                     .mid ( uInt(1+xoffset)
+                                          , uInt(width-nf_offset-4) );
       element_str = element.wc_str();
       len = element.getLength();
 
diff --git a/src/fmenubar.cpp b/src/fmenubar.cpp
index 7c17f06a..c76e6f48 100644
--- a/src/fmenubar.cpp
+++ b/src/fmenubar.cpp
@@ -215,9 +215,8 @@ void FMenuBar::drawItems()
 
     if ( x > screenWidth )
     {
-      print ( vmenubar,
-              txt.left(uInt(int(txt_length)+screenWidth-x-1)) );
-      print ( vmenubar, ".." );
+      print (vmenubar, txt.left(uInt(int(txt_length)+screenWidth-x-1)));
+      print (vmenubar, "..");
     }
     else
     {
diff --git a/src/foptimove.cpp b/src/foptimove.cpp
index 76655338..93f372e7 100644
--- a/src/foptimove.cpp
+++ b/src/foptimove.cpp
@@ -532,8 +532,8 @@ inline bool FOptiMove::isTwoDirectionMove ( int xold, int yold
 }
 
 //----------------------------------------------------------------------
-inline bool FOptiMove::isWideMove ( int xold, int yold,
-                                    int xnew, int ynew )
+inline bool FOptiMove::isWideMove ( int xold, int yold
+                                  , int xnew, int ynew )
 {
   return bool (  (xnew > MOVE_LIMIT)
               && (xnew < screen_width - 1 - MOVE_LIMIT)
diff --git a/src/fprogressbar.cpp b/src/fprogressbar.cpp
index f3f16070..d1ff8b56 100644
--- a/src/fprogressbar.cpp
+++ b/src/fprogressbar.cpp
@@ -54,8 +54,8 @@ void FProgressbar::drawBar()
   }
   else if ( getMaxColor() < 16 )
   {
-    setColor ( wc.progressbar_bg,
-               wc.progressbar_fg );
+    setColor ( wc.progressbar_bg
+             , wc.progressbar_fg );
     if ( round(length) >= 1)
       print (' ');
     else
@@ -63,11 +63,11 @@ void FProgressbar::drawBar()
   }
 
   if ( round(length) >= 1)
-    setColor( wc.progressbar_fg,
-              parentWidget()->getBackgroundColor() );
+    setColor ( wc.progressbar_fg
+             , parentWidget()->getBackgroundColor() );
   else
-    setColor( wc.progressbar_bg,
-              parentWidget()->getBackgroundColor() );
+    setColor ( wc.progressbar_bg
+             , parentWidget()->getBackgroundColor() );
 
   if ( ! isMonochron() &&  getMaxColor() >= 16 )
   {
@@ -80,8 +80,8 @@ void FProgressbar::drawBar()
       print (fc::RightHalfBlock); // ▐
   }
 
-  setColor ( wc.progressbar_bg,
-             wc.progressbar_fg );
+  setColor ( wc.progressbar_bg
+           , wc.progressbar_fg );
   if ( isMonochron() )
     setReverse(true);
   for (; i < trunc(length); i++)
diff --git a/src/fradiobutton.cpp b/src/fradiobutton.cpp
index f9d465d3..711e09df 100644
--- a/src/fradiobutton.cpp
+++ b/src/fradiobutton.cpp
@@ -11,7 +11,8 @@
 
 // constructor and destructor
 //----------------------------------------------------------------------
-FRadioButton::FRadioButton(FWidget* parent) : FToggleButton(parent)
+FRadioButton::FRadioButton(FWidget* parent)
+  : FToggleButton(parent)
 {
   init();
 }
diff --git a/src/frect.cpp b/src/frect.cpp
index e8b8095b..7ee9562d 100644
--- a/src/frect.cpp
+++ b/src/frect.cpp
@@ -169,19 +169,19 @@ FRect FRect::intersect (const FRect& r) const
 //----------------------------------------------------------------------
 FRect operator + (const FRect& r, const FPoint& p)
 {
-  return FRect( r.X1,
-                r.Y1,
-                r.X2 - r.X1 + 1 + p.getX(),
-                r.Y2 - r.Y1 + 1 + p.getY() );
+  return FRect ( r.X1
+               , r.Y1
+               , r.X2 - r.X1 + 1 + p.getX()
+               , r.Y2 - r.Y1 + 1 + p.getY() );
 }
 
 //----------------------------------------------------------------------
 FRect operator - (const FRect& r, const FPoint& p)
 {
-  return FRect( r.X1,
-                r.Y1,
-                r.X2 - r.X1 + 1 - p.getX(),
-                r.Y2 - r.Y1 + 1 - p.getY() );
+  return FRect ( r.X1
+               , r.Y1
+               , r.X2 - r.X1 + 1 - p.getX()
+               , r.Y2 - r.Y1 + 1 - p.getY() );
 }
 
 //----------------------------------------------------------------------
diff --git a/src/fstatusbar.cpp b/src/fstatusbar.cpp
index e2a7e9ad..6308c423 100644
--- a/src/fstatusbar.cpp
+++ b/src/fstatusbar.cpp
@@ -261,10 +261,10 @@ void FStatusBar::drawKeys()
         }
         else
         {
-          print ( vstatusbar,
-                  (*iter)->getText()
+          print ( vstatusbar
+                , (*iter)->getText()
                           .left(uInt(txt_length+screenWidth-x-1)) );
-          print ( vstatusbar, ".." );
+          print (vstatusbar, "..");
         }
         if ( isMonochron() )
           setReverse(true);
@@ -612,9 +612,9 @@ void FStatusBar::drawMessage()
         print (vstatusbar, getMessage());
       else
       {
-        print ( vstatusbar,
-                getMessage().left(uInt(msg_length+termWidth-x-1)) );
-        print ( vstatusbar, ".." );
+        print ( vstatusbar
+              , getMessage().left(uInt(msg_length+termWidth-x-1)) );
+        print (vstatusbar, "..");
       }
     }
   }
diff --git a/src/fstring.cpp b/src/fstring.cpp
index 00a413db..b081d558 100644
--- a/src/fstring.cpp
+++ b/src/fstring.cpp
@@ -742,9 +742,9 @@ const FString FString::operator + (const char c)
 const FString operator + (const FString& s1, const FString& s2)
 {
   FString tmp(s1);
-  tmp._insert ( uInt(wcslen(s1.wc_str())),
-                uInt(wcslen(s2.wc_str())),
-                s2.wc_str() );
+  tmp._insert ( uInt(wcslen(s1.wc_str()))
+              , uInt(wcslen(s2.wc_str()))
+              , s2.wc_str() );
   return (tmp);
 }
 
diff --git a/src/fswitch.cpp b/src/fswitch.cpp
index f86c43f7..140f8af9 100644
--- a/src/fswitch.cpp
+++ b/src/fswitch.cpp
@@ -78,8 +78,8 @@ void FSwitch::drawCheckButton()
     print (on);
     setColor (wc.button_inactive_fg, wc.button_inactive_bg);
     print (off);
-    setCursorPos ( xpos + xmin + 1 + switch_offset_pos,
-                   ypos + ymin - 1 );
+    setCursorPos ( xpos + xmin + 1 + switch_offset_pos
+                 , ypos + ymin - 1 );
   }
   else
   {
@@ -101,8 +101,8 @@ void FSwitch::drawCheckButton()
       else
         setColor (wc.button_hotkey_fg, wc.button_active_bg);
     print (off);
-    setCursorPos ( xpos + xmin + 5 + switch_offset_pos,
-                   ypos + ymin - 1 );
+    setCursorPos ( xpos + xmin + 5 + switch_offset_pos
+                 , ypos + ymin - 1 );
   }
 }
 
diff --git a/src/fterm.cpp b/src/fterm.cpp
index 1b344a9d..e8493788 100644
--- a/src/fterm.cpp
+++ b/src/fterm.cpp
@@ -308,8 +308,9 @@ int FTerm::getScreenFont()
 }
 
 //----------------------------------------------------------------------
-int FTerm::setScreenFont (uChar* fontdata, uInt count,
-                          uInt fontwidth, uInt fontheight, bool direct)
+int FTerm::setScreenFont ( uChar* fontdata, uInt count
+                         , uInt fontwidth, uInt fontheight
+                         , bool direct)
 {
   struct console_font_op font;
   int ret;
@@ -347,9 +348,9 @@ int FTerm::setScreenFont (uChar* fontdata, uInt count,
     memset(font.data, 0, data_size);
 
     for (uInt i=0; i < count; i++)
-      memcpy ( const_cast<uChar*>(font.data + bytes_per_line*32*i),
-               &fontdata[i * font.height],
-               font.height);
+      memcpy ( const_cast<uChar*>(font.data + bytes_per_line*32*i)
+             , &fontdata[i * font.height]
+             , font.height);
   }
   // font operation
   ret = ioctl (fd_tty, KDFONTOP, &font);
@@ -2440,11 +2441,11 @@ bool FTerm::setOldFont()
       {
         if ( screenFont.data )
         {
-          int ret = setScreenFont ( screenFont.data,
-                                    screenFont.charcount,
-                                    screenFont.width,
-                                    screenFont.height,
-                                    true );
+          int ret = setScreenFont ( screenFont.data
+                                  , screenFont.charcount
+                                  , screenFont.width
+                                  , screenFont.height
+                                  , true );
           delete[] screenFont.data;
           if ( ret == 0 )
             retval = true;
diff --git a/test/mandelbrot.cpp b/test/mandelbrot.cpp
index 880a7077..29d7f418 100644
--- a/test/mandelbrot.cpp
+++ b/test/mandelbrot.cpp
@@ -28,7 +28,8 @@ class Mandelbrot : public FDialog
 #pragma pack(pop)
 
 //----------------------------------------------------------------------
-Mandelbrot::Mandelbrot (FWidget* parent) : FDialog(parent)
+Mandelbrot::Mandelbrot (FWidget* parent)
+  : FDialog(parent)
 {
   setText ("Mandelbrot set");
 }