diff --git a/tiny_obj_loader.cc b/tiny_obj_loader.cc
index 2b7bd9c..dde2bc7 100755
--- a/tiny_obj_loader.cc
+++ b/tiny_obj_loader.cc
@@ -67,26 +67,18 @@ static inline bool isNewLine(const char c) {
 // Make index zero-base, and also support relative index. 
 static inline int fixIndex(int idx, int n)
 {
-  int i;
-
-  if (idx > 0) {
-    i = idx - 1;
-  } else if (idx == 0) {
-    i = 0;
-  } else { // negative value = relative
-    i = n + idx;
-  }
-  return i;
+  if (idx > 0) return idx - 1;
+  if (idx == 0) return 0;
+  return n + idx; // negative value = relative
 }
 
 static inline std::string parseString(const char*& token)
 {
   std::string s;
-  int b = strspn(token, " \t");
+  token += strspn(token, " \t");
   int e = strcspn(token, " \t\r");
-  s = std::string(&token[b], &token[e]);
-
-  token += (e - b);
+  s = std::string(&token, &token[e]);
+  token += e;
   return s;
 }