diff --git a/frame/include/bli_obj_macro_defs.h b/frame/include/bli_obj_macro_defs.h
index fbf979c8a..84c977289 100644
--- a/frame/include/bli_obj_macro_defs.h
+++ b/frame/include/bli_obj_macro_defs.h
@@ -1193,48 +1193,48 @@ BLIS_INLINE stor3_t bli_obj_stor3_from_strides( obj_t* c, obj_t* a, obj_t* b )
 
 BLIS_INLINE void* bli_obj_user_data( obj_t* obj )
 {
-    return obj->user_data;
+	return obj->user_data;
 }
 
 // User data modification
 
 BLIS_INLINE void bli_obj_set_user_data( void* data, obj_t* obj )
 {
-    obj->user_data = data;
+	obj->user_data = data;
 }
 
 // Function pointer query
 
 BLIS_INLINE obj_pack_fn_t bli_obj_pack_fn( obj_t* obj )
 {
-    return obj->pack;
+	return obj->pack;
 }
 
 BLIS_INLINE obj_ker_fn_t bli_obj_ker_fn( obj_t* obj )
 {
-    return obj->ker;
+	return obj->ker;
 }
 
 BLIS_INLINE obj_ukr_fn_t bli_obj_ukr_fn( obj_t* obj )
 {
-    return obj->ukr;
+	return obj->ukr;
 }
 
 // Function pointer modification
 
 BLIS_INLINE void bli_obj_set_pack_fn( obj_pack_fn_t pack, obj_t* obj )
 {
-    obj->pack = pack;
+	obj->pack = pack;
 }
 
 BLIS_INLINE void bli_obj_set_ker_fn( obj_ker_fn_t ker, obj_t* obj )
 {
-    obj->ker = ker;
+	obj->ker = ker;
 }
 
 BLIS_INLINE void bli_obj_set_ukr_fn( obj_ukr_fn_t ukr, obj_t* obj )
 {
-    obj->ukr = ukr;
+	obj->ukr = ukr;
 }
 
 
diff --git a/frame/include/bli_type_defs.h b/frame/include/bli_type_defs.h
index 5a180e2e9..f03fc72ac 100644
--- a/frame/include/bli_type_defs.h
+++ b/frame/include/bli_type_defs.h
@@ -1240,22 +1240,22 @@ struct thrinfo_s;
 
 typedef void (*obj_pack_fn_t)
     (
-      mdim_t mat,
-      mem_t* mem,
-      struct obj_s* a,
-      struct obj_s* ap,
-      struct cntx_s* cntx,
-      struct rntm_s* rntm,
+      mdim_t            mat,
+      mem_t*            mem,
+      struct obj_s*     a,
+      struct obj_s*     ap,
+      struct cntx_s*    cntx,
+      struct rntm_s*    rntm,
       struct thrinfo_s* thread
     );
 
 typedef void (*obj_ker_fn_t)
     (
-      struct obj_s* a,
-      struct obj_s* b,
-      struct obj_s* c,
-      struct cntx_s* cntx,
-      struct rntm_s* rntm,
+      struct obj_s*     a,
+      struct obj_s*     b,
+      struct obj_s*     c,
+      struct cntx_s*    cntx,
+      struct rntm_s*    rntm,
       struct thrinfo_s* thread
     );
 
@@ -1303,13 +1303,14 @@ typedef struct obj_s
 	dim_t         m_panel;  // m dimension of a "full" panel
 	dim_t         n_panel;  // n dimension of a "full" panel
 
-    // User data pointer
-    void*         user_data;
+	// User data pointer
+	void*         user_data;
+
+	// Function pointers
+	obj_pack_fn_t pack;
+	obj_ker_fn_t  ker;
+	obj_ukr_fn_t  ukr;
 
-    // Function pointers
-    obj_pack_fn_t pack;
-    obj_ker_fn_t  ker;
-    obj_ukr_fn_t  ukr;
 } obj_t;
 
 // Pre-initializors. Things that must be set afterwards:
@@ -1348,11 +1349,11 @@ typedef struct obj_s
 	.m_panel   = 0, \
 	.n_panel   = 0, \
 \
-    .user_data = NULL, \
+	.user_data = NULL, \
 \
-    .pack      = NULL, \
-    .ker       = NULL, \
-    .ukr       = NULL  \
+	.pack      = NULL, \
+	.ker       = NULL, \
+	.ukr       = NULL  \
 }
 
 #define BLIS_OBJECT_INITIALIZER_1X1 \
@@ -1382,11 +1383,11 @@ typedef struct obj_s
 	.m_panel   = 0, \
 	.n_panel   = 0, \
 \
-    .user_data = NULL, \
+	.user_data = NULL, \
 \
-    .pack      = NULL, \
-    .ker       = NULL, \
-    .ukr       = NULL  \
+	.pack      = NULL, \
+	.ker       = NULL, \
+	.ukr       = NULL  \
 }
 
 // Define these macros here since they must be updated if contents of