diff --git a/src/buffer/player.cpp b/src/buffer/player.cpp
index 80859619..a50357b1 100644
--- a/src/buffer/player.cpp
+++ b/src/buffer/player.cpp
@@ -80,17 +80,18 @@ int main(int argc, char** argv){
   std::string meta_str = meta.toNetPacked();
   in_out.Send(meta_str);
 
-  if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags")) && meta.isMember("video")){
+  if ( !(meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags"))
+      && meta.isMember("video")){
     //file needs to be DTSCFix'ed! Run MistDTSCFix executable on it first
     std::cerr << "Calculating / writing / updating VoD metadata..." << std::endl;
-    Util::Procs::Start("Fixer", Util::getMyPath() + "MistDTSCFix "+conf.getString("filename"));
+    Util::Procs::Start("Fixer", Util::getMyPath() + "MistDTSCFix " + conf.getString("filename"));
     while (Util::Procs::isActive("Fixer")){
       Util::sleep(5000);
     }
     std::cerr << "Done! Aborting this request to make sure all goes well." << std::endl;
     return 1;
   }
-  
+
   JSON::Value pausemark;
   pausemark["datatype"] = "pause_marker";
   pausemark["time"] = (long long int)0;
diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp
index 2cfcda61..41b8f4d3 100644
--- a/src/controller/controller.cpp
+++ b/src/controller/controller.cpp
@@ -298,7 +298,8 @@ int main(int argc, char ** argv){
             if (Request.isMember("vod")){
               std::string thisfile = Request["vod"]["filename"];
               for (JSON::ObjIter oit = Controller::Storage["streams"].ObjBegin(); oit != Controller::Storage["streams"].ObjEnd(); ++oit){
-                if ((oit->second.isMember("source") && oit->second["source"].asString() == thisfile) || (oit->second.isMember("channel") && oit->second["channel"]["URL"].asString() == thisfile)){
+                if ((oit->second.isMember("source") && oit->second["source"].asString() == thisfile)
+                    || (oit->second.isMember("channel") && oit->second["channel"]["URL"].asString() == thisfile)){
                   Controller::lastBuffer[oit->first] = Util::epoch();
                   if (Request["vod"].isMember("meta")){
                     Controller::Storage["streams"][oit->first]["meta"] = Request["vod"]["meta"];
diff --git a/src/controller/controller_streams.cpp b/src/controller/controller_streams.cpp
index 0ff3d87c..4e9387a6 100644
--- a/src/controller/controller_streams.cpp
+++ b/src/controller/controller_streams.cpp
@@ -9,8 +9,8 @@ namespace Controller {
 
   std::map<std::string, int> lastBuffer; ///< Last moment of contact with all buffers.
 
-  bool streamsEqual(JSON::Value & one, JSON::Value & two){    
-    if (!one.isMember("source") || !two.isMember("source") || one["source"] != two["source"]){
+  bool streamsEqual(JSON::Value & one, JSON::Value & two){
+    if ( !one.isMember("source") || !two.isMember("source") || one["source"] != two["source"]){
       return false;
     }
     return true;
@@ -82,7 +82,8 @@ namespace Controller {
         startStream(jit->first, jit->second);
       }
       if (currTime - lastBuffer[jit->first] > 5){
-        if (jit->second.isMember("source") && jit->second["source"].asString().substr(0, 1) == "/" && jit->second.isMember("error") && jit->second["error"].asString() == "Available"){
+        if (jit->second.isMember("source") && jit->second["source"].asString().substr(0, 1) == "/" && jit->second.isMember("error")
+            && jit->second["error"].asString() == "Available"){
           jit->second["online"] = 2;
         }else{
           if (jit->second.isMember("error") && jit->second["error"].asString() == "Available"){
@@ -95,7 +96,7 @@ namespace Controller {
         jit->second.removeMember("error");
         jit->second["online"] = 1;
         // check if source is valid
-        if ( jit->second.isMember("live") && !jit->second.isMember("meta") || !jit->second["meta"]){
+        if (jit->second.isMember("live") && !jit->second.isMember("meta") || !jit->second["meta"]){
           jit->second["online"] = 0;
           jit->second["error"] = "No (valid) source connected";
         }else{
diff --git a/src/converters/dtscfix.cpp b/src/converters/dtscfix.cpp
index fb0e2459..74e7ca8f 100644
--- a/src/converters/dtscfix.cpp
+++ b/src/converters/dtscfix.cpp
@@ -21,7 +21,8 @@ namespace Converters {
       return 1;
     }
     if (oriheader["moreheader"].asInt() > 0){
-      if ((meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags")) || !meta.isMember("video")){
+      if ((meta.isMember("keytime") && meta.isMember("keybpos") && meta.isMember("keynum") && meta.isMember("keylen") && meta.isMember("frags"))
+          || !meta.isMember("video")){
         std::cerr << "This file was already fixed or doesn't need fixing - cancelling." << std::endl;
         return 0;
       }
@@ -53,7 +54,7 @@ namespace Converters {
         if (F.getJSON()["keyframe"].asInt() != 0){
           meta["keytime"].append(F.getJSON()["time"]);
           meta["keybpos"].append(F.getLastReadPos());
-          meta["keynum"].append(++keynum);
+          meta["keynum"].append( ++keynum);
           if (meta["keytime"].size() > 1){
             meta["keylen"].append(F.getJSON()["time"].asInt() - meta["keytime"][meta["keytime"].size() - 2].asInt());
           }
@@ -87,7 +88,7 @@ namespace Converters {
           long long int fragLen = 1;
           long long int fragDur = meta["keylen"][i].asInt();
           for (unsigned int j = i; j < meta["keytime"].size(); j++){
-            if (meta["keytime"][j].asInt() / 10000 > currFrag || j == meta["keytime"].size()-1){
+            if (meta["keytime"][j].asInt() / 10000 > currFrag || j == meta["keytime"].size() - 1){
               JSON::Value thisFrag;
               thisFrag["num"] = meta["keynum"][i];
               thisFrag["len"] = fragLen;
@@ -101,7 +102,7 @@ namespace Converters {
         }
       }
     }
-    
+
     //append the revised header
     std::string loader = meta.toPacked();
     long long int newHPos = F.addHeader(loader);