--- a/src/wimax/model/bs-scheduler-simple.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/model/bs-scheduler-simple.cc	Fri May 13 15:02:36 2011 -0400
@@ -267,7 +267,7 @@
           serviceFlowRecord = (*iter2)->GetRecord ();
           NS_LOG_INFO ("processing UGS: HAS PACKET=" << (*iter2)->HasPackets () << "max Latency = "
                                                      << MilliSeconds ((*iter2)->GetMaximumLatency ()) << "Delay = " << ((currentTime
-                                                                                           - serviceFlowRecord->GetDlTimeStamp ()) + GetBs ()->GetPhy ()->GetFrameDuration ()));
+                                                                                                                         - serviceFlowRecord->GetDlTimeStamp ()) + GetBs ()->GetPhy ()->GetFrameDuration ()));
           // if latency would exceed in case grant is allocated in next frame then allocate in current frame
           if ((*iter2)->HasPackets () && ((currentTime - serviceFlowRecord->GetDlTimeStamp ())
                                           + GetBs ()->GetPhy ()->GetFrameDuration ()) > MilliSeconds ((*iter2)->GetMaximumLatency ()))

--- a/src/wimax/model/bs-uplink-scheduler-mbqos.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/model/bs-uplink-scheduler-mbqos.cc	Fri May 13 15:02:36 2011 -0400
@@ -307,7 +307,7 @@
                       // Recover period interval information for UGS flow
                       Time frame_duration = GetBs ()->GetPhy ()->GetFrameDuration ();
                       Time
-                        timestamp =
+                      timestamp =
                         (*(ssRecord->GetServiceFlows (ServiceFlow::SF_TYPE_UGS).begin ()))->GetRecord ()->GetLastGrantTime ()
                         + MilliSeconds ((*(ssRecord->GetServiceFlows (ServiceFlow::SF_TYPE_UGS).begin ()))->GetUnsolicitedGrantInterval ());
 

--- a/src/wimax/model/simple-ofdm-wimax-phy.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/model/simple-ofdm-wimax-phy.cc	Fri May 13 15:02:36 2011 -0400
@@ -43,7 +43,7 @@
 TypeId SimpleOfdmWimaxPhy::GetTypeId (void)
 {
   static TypeId
-    tid =
+  tid =
     TypeId ("ns3::SimpleOfdmWimaxPhy").SetParent<WimaxPhy> ()
 
     .AddAttribute ("NoiseFigure",

--- a/src/wimax/model/ss-net-device.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/model/ss-net-device.cc	Fri May 13 15:02:36 2011 -0400
@@ -57,7 +57,7 @@
 SubscriberStationNetDevice::GetTypeId (void)
 {
   static TypeId
-    tid =
+  tid =
     TypeId ("ns3::SubscriberStationNetDevice")
 
     .SetParent<WimaxNetDevice> ()

--- a/src/wimax/model/wimax-mac-queue.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/model/wimax-mac-queue.cc	Fri May 13 15:02:36 2011 -0400
@@ -275,7 +275,7 @@
                    "\n\t\t maxFragmentSize=" << maxFragmentSize << ""
                    "\n\t\t fragmentOffset=" << fragmentOffset <<
                    "\n\t\t payloadSize=" << packet->GetSize ()
-                                            << std::endl);
+                                           << std::endl);
       Ptr<Packet> fragment = packet->CreateFragment (fragmentOffset,
                                                      maxFragmentSize);
       m_bytes -= maxFragmentSize;

--- a/src/wimax/model/wimax-net-device.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/model/wimax-net-device.cc	Fri May 13 15:02:36 2011 -0400
@@ -52,7 +52,7 @@
 TypeId WimaxNetDevice::GetTypeId (void)
 {
   static TypeId
-    tid =
+  tid =
     TypeId ("ns3::WimaxNetDevice")
 
     .SetParent<NetDevice> ()

--- a/src/wimax/test/phy-test.cc	Fri May 13 15:01:44 2011 -0400
+++ b/src/wimax/test/phy-test.cc	Fri May 13 15:02:36 2011 -0400
@@ -108,7 +108,7 @@
 {
 
   double
-    frameDuratioTab[7] = { 0.0025, 0.004, 0.005, 0.008, 0.01, 0.0125, 0.02 };
+  frameDuratioTab[7] = { 0.0025, 0.004, 0.005, 0.008, 0.01, 0.0125, 0.02 };
   for (int i = 0; i < 7; i++)
     {
       NS_LOG_DEBUG ("Frame Duration = " << frameDuratioTab[i]);