diff --git a/src/engine/loaders/obj_loader.cpp b/src/engine/loaders/obj_loader.cpp
index 9ee95bb..8016f43 100644
--- a/src/engine/loaders/obj_loader.cpp
+++ b/src/engine/loaders/obj_loader.cpp
@@ -72,71 +72,71 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
             else if (strcmp(lineHeader, "f") == 0)
             {
 
-                int* x;
+                int *x;
                 fpos_t start;
-                fgetpos(file,&start);
-                        int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n",x,x,x,x,x,x,x,x,x);
-                fsetpos(file,&start);
-                int newerMatches =0;
+                fgetpos(file, &start);
+                int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", x, x, x, x, x, x, x, x, x);
+                fsetpos(file, &start);
+                int newerMatches = 0;
 
-                switch(matches)
+                switch (matches)
                 {
-                    /* Vs, VTs and VNs all set */
-                    case 9:
+                /* Vs, VTs and VNs all set */
+                case 9:
+                {
+                    fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n",
+                           &vertexIndex[0], &coordIndex[0], &normalIndex[0],
+                           &vertexIndex[1], &coordIndex[1], &normalIndex[1],
+                           &vertexIndex[2], &coordIndex[2], &normalIndex[2]);
+                }
+                break;
+                /* Loaded only two digits (V, VT) succesfuly. Not setting VN. */
+                case 2:
+                {
+                    fscanf(file, "%d/%d/ %d/%d/ %d/%d/\n",
+                           &vertexIndex[0], &coordIndex[0],
+                           &vertexIndex[1], &coordIndex[1],
+                           &vertexIndex[2], &coordIndex[2]);
+                }
+                break;
+                /* Only V set. Checking for existance of VT or VN. */
+                case 1:
+                {
+                    /* Check for existance of V/// configuration.. */
+                    newerMatches = fscanf(file, "%d/// %d/// %d///\n", x, x, x);
+                    fsetpos(file, &start);
+                    if (newerMatches == 3)
                     {
-                        fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n",
-                                            &vertexIndex[0], &coordIndex[0], &normalIndex[0],
-                                            &vertexIndex[1], &coordIndex[1], &normalIndex[1],
-                                            &vertexIndex[2], &coordIndex[2], &normalIndex[2]);
-
+                        /* Configuration confirmed. */
+                        fscanf(file, "%d/// %d/// %d///\n", &vertexIndex[0], &vertexIndex[1], &vertexIndex[2]);
                     }
-                    break;
-                    /* Loaded only two digits (V, VT) succesfuly. Not setting VN. */
-                    case 2:
+                    else
                     {
-                        fscanf(file, "%d/%d/ %d/%d/ %d/%d/\n",
-                                            &vertexIndex[0], &coordIndex[0],
-                                            &vertexIndex[1], &coordIndex[1],
-                                            &vertexIndex[2], &coordIndex[2]);
-                        
-                    }
-                    break;
-                    /* Only V set. Checking for existance of VT or VN. */
-                    case 1:
-                    {
-                        /* Check for existance of V/// configuration.. */
-                        newerMatches = fscanf(file, "%d/// %d/// %d///\n",x,x,x);
-                        fsetpos(file,&start);
-                        if(newerMatches==3){
-                            /* Configuration confirmed. */
-                            fscanf(file, "%d/// %d/// %d///\n",&vertexIndex[0],&vertexIndex[1],&vertexIndex[2]);
-
-                        }else
+                        /* Failed, checking configuration V//VN */
+                        newerMatches = fscanf(file, "%d//%d %d//%d %d//%d", x, x, x, x, x, x);
+                        fsetpos(file, &start);
+                        if (newerMatches == 6)
                         {
-                            /* Failed, checking configuration V//VN */
-                            newerMatches = fscanf(file, "%d//%d %d//%d %d//%d",x,x,x,x,x,x);
-                            fsetpos(file,&start);
-                            if(newerMatches==6){
-                                /* Configuration confirmed. */
-                                newerMatches = fscanf(file, "%d//%d %d//%d %d//%d",
-                                        &vertexIndex[0], &normalIndex[0],
-                                        &vertexIndex[1], &normalIndex[1],
-                                        &vertexIndex[2], &normalIndex[2]);
-                            }
-                            else{
-                                /*Unknown configuration.*/
-                                PRINT_ERR("Unknown .obj face for .obj file!");
-                                printf("Obj file mentioned: \"%s\"\n",path);
-                            }
+                            /* Configuration confirmed. */
+                            newerMatches = fscanf(file, "%d//%d %d//%d %d//%d",
+                                                  &vertexIndex[0], &normalIndex[0],
+                                                  &vertexIndex[1], &normalIndex[1],
+                                                  &vertexIndex[2], &normalIndex[2]);
+                        }
+                        else
+                        {
+                            /*Unknown configuration.*/
+                            PRINT_ERR("Unknown .obj face for .obj file!");
+                            printf("Obj file mentioned: \"%s\"\n", path);
                         }
                     }
-                    default:
-                    PRINT_ERR("Unknown faces format in .obj file!");
-                    printf(" \"%s\"\n",path);
-                    break;
-
                 }
-/*                if(ferror(file))
+                default:
+                    PRINT_ERR("Unknown faces format in .obj file!");
+                    printf(" \"%s\"\n", path);
+                    break;
+                }
+                /*                if(ferror(file))
                     PRINT_ERR("Failed to load .obj file \"%s\".");
                 else
                 {
@@ -147,64 +147,61 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
                     //if(fscanf
 
                 }*/
-                switch(matches)
+                switch (matches)
                 {
-                    case 9:
+                case 9:
+                {
+                    o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
+                    o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
+                    o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
+
+                    o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1);
+                    o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1);
+                    o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1);
+
+                    o_result->getMaterial(materialsI).setNormalFace(faceI, normalIndex[0] - 1);
+                    o_result->getMaterial(materialsI).setNormalFace(faceI + 1, normalIndex[1] - 1);
+                    o_result->getMaterial(materialsI).setNormalFace(faceI + 2, normalIndex[2] - 1);
+                    faceI += 3;
+                    break;
+                }
+                case 2:
+                {
+                    o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
+                    o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
+                    o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
+
+                    o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1);
+                    o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1);
+                    o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1);
+
+                    break;
+                }
+                case 1:
+                {
+                    if (newerMatches == 3)
+                    {
+                        o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
+                        o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
+                        o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
+                    }
+                    else if (newerMatches == 6)
                     {
                         o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
                         o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
                         o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
-
-                        o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1);
-                        o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1);
-                        o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1);
 
                         o_result->getMaterial(materialsI).setNormalFace(faceI, normalIndex[0] - 1);
                         o_result->getMaterial(materialsI).setNormalFace(faceI + 1, normalIndex[1] - 1);
                         o_result->getMaterial(materialsI).setNormalFace(faceI + 2, normalIndex[2] - 1);
-                        faceI += 3;
-                        break;
                     }
-                    case 2:
-                    {
-                        o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
-                        o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
-                        o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
-
-                        o_result->getMaterial(materialsI).setSTFace(faceI, coordIndex[0] - 1);
-                        o_result->getMaterial(materialsI).setSTFace(faceI + 1, coordIndex[1] - 1);
-                        o_result->getMaterial(materialsI).setSTFace(faceI + 2, coordIndex[2] - 1);
-
-                        break;
-                    }
-                    case 1:
-                    {
-                        if(newerMatches==3)
-                        {
-                            o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
-                            o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
-                            o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
-                        }
-                        else if(newerMatches==6)
-                        {
-                            o_result->getMaterial(materialsI).setVertexFace(faceI, vertexIndex[0] - 1);
-                            o_result->getMaterial(materialsI).setVertexFace(faceI + 1, vertexIndex[1] - 1);
-                            o_result->getMaterial(materialsI).setVertexFace(faceI + 2, vertexIndex[2] - 1);
-
-                            o_result->getMaterial(materialsI).setNormalFace(faceI, normalIndex[0] - 1);
-                            o_result->getMaterial(materialsI).setNormalFace(faceI + 1, normalIndex[1] - 1);
-                            o_result->getMaterial(materialsI).setNormalFace(faceI + 2, normalIndex[2] - 1);
-
-                        }
-                        break;
-                    }
-
+                    break;
+                }
                 }
             }
         }
         else
             break;
-            
     }
     o_result->calculateBoundingBoxes();
     fclose(file);