Revert "Opportunities to unindent code (unindent)"

pkg/components/dynmap/dynmap.go

@@ -639,24 +639,26 @@ func (v *Value) Object() (*Object, error) {
 		valid = true
 	}
 
-	if !valid {
-		return nil, ErrNotObject
-	}
-	obj := new(Object)
-	obj.valid = valid
-
-	m := make(map[string]*Value)
-
 	if valid {
-		for key, element := range v.data.(map[string]interface{}) {
-			m[key] = &Value{element, true}
+		obj := new(Object)
+		obj.valid = valid
+
+		m := make(map[string]*Value)
+
+		if valid {
+			for key, element := range v.data.(map[string]interface{}) {
+				m[key] = &Value{element, true}
+
+			}
 		}
+
+		obj.data = v.data
+		obj.m = m
+
+		return obj, nil
 	}
 
-	obj.data = v.data
-	obj.m = m
-
-	return obj, nil
+	return nil, ErrNotObject
 }
 
 // Attempts to typecast the current value into an object arrau.
@@ -676,19 +678,23 @@ func (v *Value) ObjectArray() ([]*Object, error) {
 	// Unsure if this is a good way to use slices, it's probably not
 	var slice []*Object
 
-	if !valid {
-		return nil, ErrNotObjectArray
-	}
-	for _, element := range v.data.([]interface{}) {
-		childValue := Value{element, true}
-		childObject, err := childValue.Object()
+	if valid {
 
-		if err != nil {
-			return nil, ErrNotObjectArray
+		for _, element := range v.data.([]interface{}) {
+			childValue := Value{element, true}
+			childObject, err := childValue.Object()
+
+			if err != nil {
+				return nil, ErrNotObjectArray
+			}
+			slice = append(slice, childObject)
 		}
-		slice = append(slice, childObject)
+
+		return slice, nil
 	}
-	return slice, nil
+
+	return nil, ErrNotObjectArray
+
 }
 
 // Attempts to typecast the current value into a string.

pkg/components/simplejson/simplejson.go

@@ -168,8 +168,10 @@ func (j *Json) GetPath(branch ...string) *Json {
 //    js.Get("top_level").Get("array").GetIndex(1).Get("key").Int()
 func (j *Json) GetIndex(index int) *Json {
 	a, err := j.Array()
-	if err == nil && len(a) > index {
-		return &Json{a[index]}
+	if err == nil {
+		if len(a) > index {
+			return &Json{a[index]}
+		}
 	}
 	return &Json{nil}
 }