diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
index 03a41573eb1d59bdb25ddf1a1dd37e4945a5b57b..bf73e1d3adc85087640d71de15ecb1596ba8be93 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionToolCosmics.cxx
@@ -142,7 +142,8 @@ StatusCode InDet::TRT_TrackExtensionToolCosmics::finalize()
 MsgStream& InDet::TRT_TrackExtensionToolCosmics::dump( MsgStream& out ) const
 {
   out<<std::endl;
-  if(m_nprint)  return dumpEvent(out); return dumpConditions(out);
+  if(m_nprint)  return dumpEvent(out);
+  return dumpConditions(out);
 }
 
 
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
index d1336a03ffcd8a2703bc13ccb053735d058213ed..a9a9ae79ee70d79f48d46ff96afafabf339ef924 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrackExtensionTool_xk.cxx
@@ -225,7 +225,8 @@ StatusCode InDet::TRT_TrackExtensionTool_xk::finalize()
 MsgStream& InDet::TRT_TrackExtensionTool_xk::dump( MsgStream& out ) const
 {
   out<<std::endl;
-  if(m_nprint)  return dumpEvent(out); return dumpConditions(out);
+  if(m_nprint)  return dumpEvent(out);
+  return dumpConditions(out);
 }
 
 
@@ -487,7 +488,8 @@ StatusCode InDet::TRT_TrackExtensionTool_xk::magneticFieldInit(IOVSVC_CALLBACK_A
 {
   // Build MagneticFieldProperties 
   //
-  if(!m_fieldService->solenoidOn()) m_fieldmode ="NoField"; magneticFieldInit();
+  if(!m_fieldService->solenoidOn()) m_fieldmode ="NoField";
+  magneticFieldInit();
   return StatusCode::SUCCESS;
 }
 
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
index 9b6bf7236a9fd8af158fa31741ae09d52720ef69..da19daa6055d6730e743ab077939d45ec22f0e55 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_TrajectoryElement_xk.cxx
@@ -506,7 +506,7 @@ const Trk::RIO_OnTrack* InDet::TRT_TrajectoryElement_xk::rioOnTrack()
     (&(m_link[l].cluster()->detectorElement())->surface(m_link[l].cluster()->identify()));
   Trk::AtaStraightLine Tp(m_link[l].impact(),m_link[l].zlocal(),1.,1.,1.,*line);
   if(m_status==2)  return m_riomakerD->correct(*m_link[l].cluster(),Tp);
-                   return m_riomakerN->correct(*m_link[l].cluster(),Tp);
+  return m_riomakerN->correct(*m_link[l].cluster(),Tp);
 }
 
 ///////////////////////////////////////////////////////////////////
diff --git a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
index 01b162b974595a94dc8bc6ac73e697d6844a1493..152702096ad05965e7fd3a3e1b27003a323244f7 100755
--- a/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
+++ b/InnerDetector/InDetRecTools/TRT_TrackExtensionTool_xk/src/TRT_Trajectory_xk.cxx
@@ -103,7 +103,8 @@ void InDet::TRT_Trajectory_xk::initiateForPrecisionSeed
 
       q = m_elements[m_nElements].initiateForPrecisionSeed(false,(*d),ti,te,(*i),A,m_roadwidth2);
     }
-    if(q && m_elements[m_nElements].nlinks()) ++m_nElements; if(++d==de) break;
+    if(q && m_elements[m_nElements].nlinks()) ++m_nElements;
+    if(++d==de) break;
 
     // New trajectory direction calculation
     //
@@ -427,8 +428,10 @@ void  InDet::TRT_Trajectory_xk::buildTrajectoryForPrecisionSeed
     bool h = false         ;
     if     (m_elements[e].buildForPrecisionSeed(m_A,m_B,q,h)) { // Cluster
       
-      if(++m_nclusters==1) m_firstTrajectory=e; m_lastTrajectory=e; 
-      if(q) ++m_ntclusters; m_nholes = m_nholese; 
+      if(++m_nclusters==1) m_firstTrajectory=e;
+      m_lastTrajectory=e;
+      if(q) ++m_ntclusters;
+      m_nholes = m_nholese;
     }
     else if(h)                                                  { // Hole
       m_nclusters ? ++m_nholese : ++m_nholesb;
@@ -455,8 +458,10 @@ void  InDet::TRT_Trajectory_xk::buildTrajectoryForTRTSeed
     bool h = false         ;
     if     (m_elements[e].buildForTRTSeed(m_A,m_B,q,h)) { // Cluster
       
-      if(++m_nclusters==1) m_firstTrajectory=e; m_lastTrajectory=e; 
-      if(q) ++m_ntclusters; m_nholes = m_nholese; 
+      if(++m_nclusters==1) m_firstTrajectory=e;
+      m_lastTrajectory=e;
+      if(q) ++m_ntclusters;
+      m_nholes = m_nholese;
     }
     else if(h)                                                  { // Hole
       m_nclusters ? ++m_nholese : ++m_nholesb;
@@ -738,7 +743,8 @@ bool InDet::TRT_Trajectory_xk::fitter()
 
     rad+=trad;
     bool br = m_elements[e].isBarrel(); 
-    if( (br && !barrel) || (!br && barrel) ) rad+=.1; barrel = br;
+    if( (br && !barrel) || (!br && barrel) ) rad+=.1;
+    barrel = br;
 
     if(m_elements[e].status() > 0) {
 
@@ -824,7 +830,8 @@ void InDet::TRT_Trajectory_xk::stabline(int Np,double DA) {
       i-=2;
     } 
 
-    if(m<=4) break; sort(m_SS,m);
+    if(m<=4) break;
+    sort(m_SS,m);
 
     int   nm = 0; s = 0; sm=-1000;
     for(int i=0; i!=m-1; ++i) {
@@ -882,7 +889,8 @@ Trk::Track* InDet::TRT_Trajectory_xk::convert(const Trk::Track& Tr)
     
     rad+=trad;
     bool br = m_elements[e].isBarrel();
-    if( (br && !barrel) || (!br && barrel) ) rad+=.1; barrel = br;
+    if( (br && !barrel) || (!br && barrel) ) rad+=.1;
+    barrel = br;
  
     if(m_elements[e].status() > 0) {