diff --git a/tsk3/base/XGetopt.c b/tsk3/base/XGetopt.c
index dc0732d29ef66b2399b66f98326437e1ee84119a..9b1ee7f04d930e3428bd564e6f7c5ad391e9db96 100644
--- a/tsk3/base/XGetopt.c
+++ b/tsk3/base/XGetopt.c
@@ -194,7 +194,7 @@ tsk_getopt(int argc, TSK_TCHAR * const argv[], const TSK_TCHAR * optstring)
     }
 
     c = *next++;
-    cp = (TSK_TCHAR *)TSTRCHR(optstring, c);
+    cp = (TSK_TCHAR *) TSTRCHR(optstring, c);
 
     if (cp == NULL || c == _TSK_T(':'))
         return _TSK_T('?');
diff --git a/tsk3/fs/ext2fs_dent.c b/tsk3/fs/ext2fs_dent.c
index 5156ed4f5bb1d3b5f85a5032b49449b27e933e8f..8f847d9313cefefb5ec3f459a3dd67ea61ca419f 100644
--- a/tsk3/fs/ext2fs_dent.c
+++ b/tsk3/fs/ext2fs_dent.c
@@ -338,9 +338,9 @@ ext2fs_dir_open_meta(TSK_FS_INFO * a_fs, TSK_FS_DIR ** a_fs_dir,
 
         retval_tmp =
             ext2fs_dent_parse_block(ext2fs, fs_dir,
-            (fs_dir->fs_file->meta->
-                flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0, &list_seen,
-            dirptr, len);
+            (fs_dir->fs_file->
+                meta->flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0,
+            &list_seen, dirptr, len);
 
         if (retval_tmp == TSK_ERR) {
             retval_final = TSK_ERR;
diff --git a/tsk3/fs/ext2fs_journal.c b/tsk3/fs/ext2fs_journal.c
index 0c68e707ffc553879f2f258ec4a6b691b77aec64..e99d6cf777c44de47d95751fbdb99957185be735 100644
--- a/tsk3/fs/ext2fs_journal.c
+++ b/tsk3/fs/ext2fs_journal.c
@@ -400,8 +400,8 @@ ext2fs_jentry_walk(TSK_FS_INFO * fs, int flags,
                     break;
 
                 /* If the SAMEID value is set, then we advance by the size of the entry, otherwise add 16 for the ID */
-                else if (big_tsk_getu32(dentry->
-                        flag) & EXT2_J_DENTRY_SAMEID)
+                else if (big_tsk_getu32(dentry->flag) &
+                    EXT2_J_DENTRY_SAMEID)
                     dentry =
                         (ext2fs_journ_dentry *) ((uintptr_t) dentry +
                         sizeof(ext2fs_journ_dentry));
diff --git a/tsk3/fs/fatfs_dent.c b/tsk3/fs/fatfs_dent.c
index d9d895f829ddf5ffede6db876e1b546749c7f173..a437b9b42296931e5e8fb3acfdfc18da371f2388 100644
--- a/tsk3/fs/fatfs_dent.c
+++ b/tsk3/fs/fatfs_dent.c
@@ -95,14 +95,12 @@ fatfs_dir_buf_add(FATFS_INFO * fatfs, TSK_INUM_T par_inum,
     if (fatfs->dir_buf_next == fatfs->dir_buf_size) {
         fatfs->dir_buf_size += 256;
         if ((fatfs->dir_buf =
-                (TSK_INUM_T *) tsk_realloc(fatfs->
-                    dir_buf,
+                (TSK_INUM_T *) tsk_realloc(fatfs->dir_buf,
                     fatfs->dir_buf_size * sizeof(TSK_INUM_T))) == NULL) {
             return 1;
         }
         if ((fatfs->par_buf =
-                (TSK_INUM_T *) tsk_realloc(fatfs->
-                    par_buf,
+                (TSK_INUM_T *) tsk_realloc(fatfs->par_buf,
                     fatfs->dir_buf_size * sizeof(TSK_INUM_T))) == NULL) {
             return 1;
         }
@@ -291,8 +289,8 @@ fatfs_dent_parse_buf(FATFS_INFO * fatfs, TSK_FS_DIR * a_fs_dir, char *buf,
 
                     /* Convert the UTF16 to UTF8 */
                     UTF16 *name16 =
-                        (UTF16 *) ((uintptr_t) & lfninfo.
-                        name[lfninfo.start + 1]);
+                        (UTF16 *) ((uintptr_t) & lfninfo.name[lfninfo.
+                            start + 1]);
                     UTF8 *name8 = (UTF8 *) fs_name->name;
 
                     retVal =
diff --git a/tsk3/fs/fatfs_meta.c b/tsk3/fs/fatfs_meta.c
index abfc742c778a0e8d25e626e05b153b1ffdbfdfe4..4afc438ce696a01ccb0ef17e11a68f65262f0254 100644
--- a/tsk3/fs/fatfs_meta.c
+++ b/tsk3/fs/fatfs_meta.c
@@ -349,9 +349,8 @@ fatfs_dinode_copy(FATFS_INFO * fatfs, TSK_FS_META * fs_meta,
         retVal = tsk_UTF16toUTF8(fs->endian, (const UTF16 **) &name16,
             (UTF16 *) & lfn->part2[12],
             &name8,
-            (UTF8 *) ((uintptr_t) fs_meta->name2->
-                name + sizeof(fs_meta->name2->name)),
-            TSKlenientConversion);
+            (UTF8 *) ((uintptr_t) fs_meta->name2->name +
+                sizeof(fs_meta->name2->name)), TSKlenientConversion);
 
         if (retVal != TSKconversionOK) {
             tsk_error_reset();
@@ -369,9 +368,8 @@ fatfs_dinode_copy(FATFS_INFO * fatfs, TSK_FS_META * fs_meta,
         retVal = tsk_UTF16toUTF8(fs->endian, (const UTF16 **) &name16,
             (UTF16 *) & lfn->part3[4],
             &name8,
-            (UTF8 *) ((uintptr_t) fs_meta->name2->
-                name + sizeof(fs_meta->name2->name)),
-            TSKlenientConversion);
+            (UTF8 *) ((uintptr_t) fs_meta->name2->name +
+                sizeof(fs_meta->name2->name)), TSKlenientConversion);
 
         if (retVal != TSKconversionOK) {
             tsk_error_reset();
diff --git a/tsk3/fs/ffs_dent.c b/tsk3/fs/ffs_dent.c
index f0ec5d7f24f020f6bde6d7925fb197290da428fe..4c141ba3dee514598259ce464b8e01ffa25b8a80 100644
--- a/tsk3/fs/ffs_dent.c
+++ b/tsk3/fs/ffs_dent.c
@@ -334,8 +334,8 @@ ffs_dir_open_meta(TSK_FS_INFO * a_fs, TSK_FS_DIR ** a_fs_dir,
 
         retval_tmp =
             ffs_dent_parse_block(ffs, fs_dir,
-            (fs_dir->fs_file->meta->
-                flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0,
+            (fs_dir->fs_file->
+                meta->flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0,
             dirbuf + cidx * FFS_DIRBLKSIZ, len);
 
         if (retval_tmp == TSK_ERR) {
diff --git a/tsk3/fs/fs_attr.c b/tsk3/fs/fs_attr.c
index 6d31ee8fd37b5b3647d1968c6e3549ad86b49f19..58a73eab507bdbf0b4ff33322b90399b867da91f 100644
--- a/tsk3/fs/fs_attr.c
+++ b/tsk3/fs/fs_attr.c
@@ -786,8 +786,8 @@ tsk_fs_attr_walk_nonres(const TSK_FS_ATTR * fs_attr,
 
             /* If the address is too large then give an error */
             if (addr + len_idx > fs->last_block) {
-                if (fs_attr->fs_file->
-                    meta->flags & TSK_FS_META_FLAG_UNALLOC)
+                if (fs_attr->fs_file->meta->
+                    flags & TSK_FS_META_FLAG_UNALLOC)
                     tsk_errno = TSK_ERR_FS_RECOVER;
                 else
                     tsk_errno = TSK_ERR_FS_BLK_NUM;
@@ -1112,8 +1112,8 @@ tsk_fs_attr_read(const TSK_FS_ATTR * a_fs_attr, TSK_OFF_T a_offset,
                     fprintf(stderr,
                         "tsk_fs_attr_read_type: File %" PRIuINUM
                         " has FILLER entry, using 0s\n",
-                        (a_fs_attr->fs_file->meta) ? a_fs_attr->
-                        fs_file->meta->addr : 0);
+                        (a_fs_attr->fs_file->meta) ? a_fs_attr->fs_file->
+                        meta->addr : 0);
             }
             // we return 0s for reads past the initsize (unless they want slack space)
             else if (((TSK_OFF_T) ((data_run_cur->offset +
@@ -1125,9 +1125,8 @@ tsk_fs_attr_read(const TSK_FS_ATTR * a_fs_attr, TSK_OFF_T a_offset,
                     fprintf(stderr,
                         "tsk_fs_attr_read: Returning 0s for read past end of initsize (%"
                         PRIuINUM ")\n", ((a_fs_attr->fs_file)
-                            && (a_fs_attr->fs_file->
-                                meta)) ? a_fs_attr->fs_file->meta->
-                        addr : 0);
+                            && (a_fs_attr->fs_file->meta)) ? a_fs_attr->
+                        fs_file->meta->addr : 0);
             }
             else {
                 TSK_OFF_T fs_offset_b;
diff --git a/tsk3/fs/fs_name.c b/tsk3/fs/fs_name.c
index 09c7581d9dceb3c101ee8a4cfdb5439dde21061e..ea67c26dbd3b78d861fab01aed218970030f0755 100644
--- a/tsk3/fs/fs_name.c
+++ b/tsk3/fs/fs_name.c
@@ -376,8 +376,9 @@ tsk_fs_name_print(FILE * hFile, const TSK_FS_FILE * fs_file,
 
     tsk_fprintf(hFile, "%s:\t",
         ((fs_file->meta) && (fs_file->meta->flags & TSK_FS_META_FLAG_ALLOC)
-            && (fs_file->name->
-                flags & TSK_FS_NAME_FLAG_UNALLOC)) ? "(realloc)" : "");
+            && (fs_file->
+                name->flags & TSK_FS_NAME_FLAG_UNALLOC)) ? "(realloc)" :
+        "");
 
     if ((print_path) && (a_path != NULL))
         tsk_fprintf(hFile, "%s", a_path);
@@ -516,8 +517,9 @@ tsk_fs_name_print_mac(FILE * hFile, const TSK_FS_FILE * fs_file,
      * allocated, then add realloc comment */
     if (fs_file->name->flags & TSK_FS_NAME_FLAG_UNALLOC)
         tsk_fprintf(hFile, " (deleted%s)", ((fs_file->meta)
-                && (fs_file->meta->
-                    flags & TSK_FS_META_FLAG_ALLOC)) ? "-realloc" : "");
+                && (fs_file->
+                    meta->flags & TSK_FS_META_FLAG_ALLOC)) ? "-realloc" :
+            "");
 
     /* inode */
     tsk_fprintf(hFile, "|%" PRIuINUM, fs_file->name->meta_addr);
diff --git a/tsk3/fs/iso9660.c b/tsk3/fs/iso9660.c
index e5ff29cdd1d28f451510117215743828a66fdd54..47b5d698b979a25742a553d006292b3740a55408 100644
--- a/tsk3/fs/iso9660.c
+++ b/tsk3/fs/iso9660.c
@@ -456,8 +456,8 @@ iso9660_load_inodes_dir(TSK_FS_INFO * fs, TSK_OFF_T a_offs, int count,
                         tsk_UTF16toUTF8(fs->endian,
                         (const UTF16 **) &name16,
                         (UTF16 *) & buf[b_offs + dentry->fi_len], &name8,
-                        (UTF8 *) ((uintptr_t) & in_node->inode.
-                            fn[ISO9660_MAXNAMLEN_STD]),
+                        (UTF8 *) ((uintptr_t) & in_node->
+                            inode.fn[ISO9660_MAXNAMLEN_STD]),
                         TSKlenientConversion);
                     if (retVal != TSKconversionOK) {
                         if (tsk_verbose)
diff --git a/tsk3/fs/nofs_misc.c b/tsk3/fs/nofs_misc.c
index 7a34d0a3a6b40a838176c2f1e30bca5cc093215e..ad5a950c97b0c3c6aa9f56fd217c4939c8ab6148 100644
--- a/tsk3/fs/nofs_misc.c
+++ b/tsk3/fs/nofs_misc.c
@@ -58,8 +58,8 @@ tsk_fs_nofs_make_data_run(TSK_FS_FILE * a_fs_file)
     tsk_errno = TSK_ERR_FS_UNSUPFUNC;
     snprintf(tsk_errstr, TSK_ERRSTR_L,
         "Illegal analysis method for %s data ",
-        (a_fs_file->fs_info) ? tsk_fs_type_toname(a_fs_file->fs_info->
-            ftype) : "");
+        (a_fs_file->fs_info) ? tsk_fs_type_toname(a_fs_file->
+            fs_info->ftype) : "");
     return 1;
 }
 
diff --git a/tsk3/fs/ntfs.c b/tsk3/fs/ntfs.c
index 71c9295cfb1de18bb7371fca64d231c369029fcb..b37292472be95fc05b5223e96581ba24ddfec414 100644
--- a/tsk3/fs/ntfs.c
+++ b/tsk3/fs/ntfs.c
@@ -1220,8 +1220,8 @@ ntfs_attr_walk_special(const TSK_FS_ATTR * fs_attr,
                 if (fs_attr_run->addr != 0) {
                     tsk_error_reset();
 
-                    if (fs_attr->fs_file->meta->
-                        flags & TSK_FS_META_FLAG_UNALLOC)
+                    if (fs_attr->fs_file->
+                        meta->flags & TSK_FS_META_FLAG_UNALLOC)
                         tsk_errno = TSK_ERR_FS_RECOVER;
                     else
                         tsk_errno = TSK_ERR_FS_GENFS;
@@ -1248,8 +1248,8 @@ ntfs_attr_walk_special(const TSK_FS_ATTR * fs_attr,
                 if (addr > fs->last_block) {
                     tsk_error_reset();
 
-                    if (fs_attr->fs_file->meta->
-                        flags & TSK_FS_META_FLAG_UNALLOC)
+                    if (fs_attr->fs_file->
+                        meta->flags & TSK_FS_META_FLAG_UNALLOC)
                         tsk_errno = TSK_ERR_FS_RECOVER;
                     else
                         tsk_errno = TSK_ERR_FS_BLK_NUM;
@@ -1289,8 +1289,8 @@ ntfs_attr_walk_special(const TSK_FS_ATTR * fs_attr,
                             TSK_FS_BLOCK_FLAG_COMP;
                         retval = is_clustalloc(ntfs, comp_unit[i]);
                         if (retval == -1) {
-                            if (fs_attr->fs_file->meta->
-                                flags & TSK_FS_META_FLAG_UNALLOC)
+                            if (fs_attr->fs_file->
+                                meta->flags & TSK_FS_META_FLAG_UNALLOC)
                                 tsk_errno = TSK_ERR_FS_RECOVER;
                             free(comp_unit);
                             ntfs_uncompress_done(&comp);
@@ -1348,8 +1348,8 @@ ntfs_attr_walk_special(const TSK_FS_ATTR * fs_attr,
                  * it remains 0 */
                 if (((fs_attr_run->flags & TSK_FS_ATTR_RUN_FLAG_SPARSE) ==
                         0)
-                    && ((fs_attr_run->
-                            flags & TSK_FS_ATTR_RUN_FLAG_FILLER) == 0))
+                    && ((fs_attr_run->flags & TSK_FS_ATTR_RUN_FLAG_FILLER)
+                        == 0))
                     addr++;
             }
 
@@ -1513,8 +1513,8 @@ ntfs_file_read_special(const TSK_FS_ATTR * a_fs_attr,
                         (a_fs_attr->fs_file->meta->size - (a_offset +
                                 buf_idx)))
                         cpylen =
-                            (size_t)(a_fs_attr->fs_file->meta->size - (a_offset +
-                                buf_idx));
+                            (size_t) (a_fs_attr->fs_file->meta->size -
+                            (a_offset + buf_idx));
 
                     memcpy(&a_buf[buf_idx], &comp.uncomp_buf[byteoffset],
                         cpylen);
@@ -1528,8 +1528,8 @@ ntfs_file_read_special(const TSK_FS_ATTR * a_fs_attr,
                  * it remains 0 */
                 if (((data_run_cur->flags & TSK_FS_ATTR_RUN_FLAG_SPARSE) ==
                         0)
-                    && ((data_run_cur->
-                            flags & TSK_FS_ATTR_RUN_FLAG_FILLER) == 0))
+                    && ((data_run_cur->flags & TSK_FS_ATTR_RUN_FLAG_FILLER)
+                        == 0))
                     addr++;
             }
         }
@@ -2611,8 +2611,7 @@ ntfs_attrname_lookup(TSK_FS_INFO * fs, uint16_t type, char *name, int len)
             retVal =
                 tsk_UTF16toUTF8(fs->endian, (const UTF16 **) &name16,
                 (UTF16 *) ((uintptr_t) name16 +
-                    sizeof(attrdef->
-                        label)),
+                    sizeof(attrdef->label)),
                 &name8,
                 (UTF8 *) ((uintptr_t) name8 + len), TSKlenientConversion);
             if (retVal != TSKconversionOK) {
@@ -3633,8 +3632,7 @@ ntfs_fsstat(TSK_FS_INFO * fs, FILE * hFile)
         retVal =
             tsk_UTF16toUTF8(fs->endian, (const UTF16 **) &name16,
             (UTF16 *) ((uintptr_t) name16 +
-                (int) fs_attr->
-                size), &name8,
+                (int) fs_attr->size), &name8,
             (UTF8 *) ((uintptr_t) name8 + sizeof(asc)),
             TSKlenientConversion);
         if (retVal != TSKconversionOK) {
@@ -3715,8 +3713,7 @@ ntfs_fsstat(TSK_FS_INFO * fs, FILE * hFile)
         retVal =
             tsk_UTF16toUTF8(fs->endian, (const UTF16 **) &name16,
             (UTF16 *) ((uintptr_t) name16 +
-                sizeof(attrdeftmp->
-                    label)),
+                sizeof(attrdeftmp->label)),
             &name8,
             (UTF8 *) ((uintptr_t) name8 + sizeof(asc)),
             TSKlenientConversion);
@@ -3751,8 +3748,7 @@ ntfs_fsstat(TSK_FS_INFO * fs, FILE * hFile)
             (tsk_getu32(fs->endian, attrdeftmp->flags) &
                 NTFS_ATTRDEF_FLAGS_RES ? "Resident" :
                 ""), (tsk_getu32(fs->endian,
-                    attrdeftmp->
-                    flags) &
+                    attrdeftmp->flags) &
                 NTFS_ATTRDEF_FLAGS_NONRES ?
                 "Non-resident" : ""),
             (tsk_getu32(fs->endian, attrdeftmp->flags) &
@@ -3829,11 +3825,10 @@ ntfs_istat(TSK_FS_INFO * fs, FILE * hFile,
         "$LogFile Sequence Number: %" PRIu64
         "\n", tsk_getu64(fs->endian, ntfs->mft->lsn));
     tsk_fprintf(hFile, "%sAllocated %s\n",
-        (fs_file->meta->
-            flags & TSK_FS_META_FLAG_ALLOC) ? "" :
+        (fs_file->meta->flags & TSK_FS_META_FLAG_ALLOC) ? "" :
         "Not ",
-        (fs_file->meta->
-            type == TSK_FS_META_TYPE_DIR) ? "Directory" : "File");
+        (fs_file->meta->type ==
+            TSK_FS_META_TYPE_DIR) ? "Directory" : "File");
     tsk_fprintf(hFile, "Links: %u\n", fs_file->meta->nlink);
 
     /* STANDARD_INFORMATION info */
@@ -4174,17 +4169,13 @@ ntfs_istat(TSK_FS_INFO * fs, FILE * hFile,
                 ")   Name: %s   %sResident%s%s%s   size: %"
                 PRIuOFF "\n", type, fs_attr->type,
                 fs_attr->id, fs_attr->name,
-                (fs_attr->
-                    flags & TSK_FS_ATTR_NONRES) ? "Non-" :
+                (fs_attr->flags & TSK_FS_ATTR_NONRES) ? "Non-" :
                 "",
-                (fs_attr->
-                    flags & TSK_FS_ATTR_ENC) ? ", Encrypted"
+                (fs_attr->flags & TSK_FS_ATTR_ENC) ? ", Encrypted"
                 : "",
-                (fs_attr->
-                    flags & TSK_FS_ATTR_COMP) ?
+                (fs_attr->flags & TSK_FS_ATTR_COMP) ?
                 ", Compressed" : "",
-                (fs_attr->
-                    flags & TSK_FS_ATTR_SPARSE) ? ", Sparse" : "",
+                (fs_attr->flags & TSK_FS_ATTR_SPARSE) ? ", Sparse" : "",
                 fs_attr->size);
 
             /* print the layout if it is non-resident and not "special" */
diff --git a/tsk3/fs/ntfs_dent.c b/tsk3/fs/ntfs_dent.c
index d6e74931a1f2c802f88292fac4407ffa2ae2a400..78cce20b5e56ec5d601ed25e1b3ef2857b0a38a6 100644
--- a/tsk3/fs/ntfs_dent.c
+++ b/tsk3/fs/ntfs_dent.c
@@ -991,8 +991,8 @@ ntfs_dir_open_meta(TSK_FS_INFO * a_fs, TSK_FS_DIR ** a_fs_dir,
 
             /* process the list of index entries */
             retval_tmp = ntfs_proc_idxentry(ntfs, fs_dir,
-                (fs_dir->fs_file->meta->
-                    flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0, idxe,
+                (fs_dir->fs_file->
+                    meta->flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0, idxe,
                 list_len, tsk_getu32(a_fs->endian,
                     idxelist->seqend_off) - tsk_getu32(a_fs->endian,
                     idxelist->begin_off));
@@ -1056,8 +1056,8 @@ ntfs_dir_open_meta(TSK_FS_INFO * a_fs, TSK_FS_DIR ** a_fs_dir,
 
             /* process the list of index entries */
             retval_tmp = ntfs_proc_idxentry(ntfs, fs_dir,
-                (fs_dir->fs_file->meta->
-                    flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0, idxe,
+                (fs_dir->fs_file->
+                    meta->flags & TSK_FS_META_FLAG_UNALLOC) ? 1 : 0, idxe,
                 list_len, tsk_getu32(a_fs->endian,
                     idxelist->seqend_off) - tsk_getu32(a_fs->endian,
                     idxelist->begin_off));
@@ -1368,8 +1368,8 @@ ntfs_find_file(TSK_FS_INFO * fs, TSK_INUM_T inode_toid, uint32_t type_toid,
     fs_file->name->meta_seq = 0;
     fs_file->name->flags =
         ((tsk_getu16(fs->endian,
-                ntfs->mft->
-                flags) & NTFS_MFT_INUSE) ? TSK_FS_NAME_FLAG_ALLOC :
+                ntfs->
+                mft->flags) & NTFS_MFT_INUSE) ? TSK_FS_NAME_FLAG_ALLOC :
         TSK_FS_NAME_FLAG_UNALLOC);
 
     memset(&dinfo, 0, sizeof(NTFS_DINFO));
diff --git a/tsk3/img/aff.c b/tsk3/img/aff.c
index 2813fbf495f84395880e900eddf9c8ea0bda2108..2f4b147d8d5903da2452c14604c48da522d7b1cf 100644
--- a/tsk3/img/aff.c
+++ b/tsk3/img/aff.c
@@ -103,7 +103,7 @@ aff_imgstat(TSK_IMG_INFO * img_info, FILE * hFile)
     }
 
     tsk_fprintf(hFile, "\nSize in bytes: %" PRIuOFF "\n", img_info->size);
-    
+
     // we won't have the rest of the info for the non-AFF formats.
     if (img_info->itype == TSK_IMG_TYPE_AFF_ANY)
         return;
diff --git a/tsk3/img/img_types.c b/tsk3/img/img_types.c
index 802cee36c01e2cb69106530a091ae8088cd8811c..f1c0059ff8f9df1f9e318295f82f29ae0605fc27 100644
--- a/tsk3/img/img_types.c
+++ b/tsk3/img/img_types.c
@@ -35,7 +35,7 @@ static IMG_TYPES img_open_table[] = {
     {"afd", TSK_IMG_TYPE_AFF_AFD, "AFF Multiple File"},
     {"afm", TSK_IMG_TYPE_AFF_AFM, "AFF with external metadata"},
     {"afflib", TSK_IMG_TYPE_AFF_ANY,
-            "All AFFLIB image formats (including beta ones)"},
+        "All AFFLIB image formats (including beta ones)"},
 #endif
 #if HAVE_LIBEWF
     {"ewf", TSK_IMG_TYPE_EWF_EWF, "Expert Witness format (encase)"},
diff --git a/tsk3/img/tsk_img.h b/tsk3/img/tsk_img.h
index c519a3fd70f4268e56ef6955cc0cac6da0efd09f..93c4948c5b5d862e938890c12d1df0cb77171797 100644
--- a/tsk3/img/tsk_img.h
+++ b/tsk3/img/tsk_img.h
@@ -87,7 +87,7 @@ extern "C" {
         int cache_age[TSK_IMG_INFO_CACHE_NUM];  ///< "Age" of corresponding cache entry, higher means more recently used
         size_t cache_len[TSK_IMG_INFO_CACHE_NUM];       ///< Length of cache entry used (0 if never used)
 
-        ssize_t(*read) (TSK_IMG_INFO * img, TSK_OFF_T off, char *buf, size_t len);     ///< \internal External progs should call tsk_img_read() 
+         ssize_t(*read) (TSK_IMG_INFO * img, TSK_OFF_T off, char *buf, size_t len);     ///< \internal External progs should call tsk_img_read() 
         void (*close) (TSK_IMG_INFO *); ///< \internal Progs should call tsk_img_close()
         void (*imgstat) (TSK_IMG_INFO *, FILE *);       ///< Pointer to file type specific function
     };
diff --git a/tsk3/vs/tsk_vs.h b/tsk3/vs/tsk_vs.h
index 5ccf550fc33c3ad5d8ee466719677f83ee16b066..b39608ef5256a30d70ed6eedb3a2bd76bf09ba82 100644
--- a/tsk3/vs/tsk_vs.h
+++ b/tsk3/vs/tsk_vs.h
@@ -71,7 +71,7 @@ extern "C" {
 
         TSK_PNUM_T part_count;  ///< number of partitions 
 
-        void (*close) (TSK_VS_INFO *); ///< \internal Progs should call tsk_vs_close().
+        void (*close) (TSK_VS_INFO *);  ///< \internal Progs should call tsk_vs_close().
     };