diff --git a/libntfs/bootsect.c b/libntfs/bootsect.c
index cf81bb10..3b625ef2 100644
--- a/libntfs/bootsect.c
+++ b/libntfs/bootsect.c
@@ -96,8 +96,7 @@ BOOL ntfs_boot_sector_is_ntfs(NTFS_BOOT_SECTOR *b, const BOOL silent __attribute
 	/* Check sectors per cluster value is valid. */
 	ntfs_log_debug("Checking sectors per cluster... ");
 	switch (b->bpb.sectors_per_cluster) {
-	case 1: case 2: case 4: case 8: case 16:
-	case 32: case 64: case 128:
+	case 1: case 2: case 4: case 8: case 16: case 32: case 64: case 128:
 		break;
 	default:
 		goto not_ntfs;
diff --git a/libntfs/volume.c b/libntfs/volume.c
index 8cb65305..ca6dcd7e 100644
--- a/libntfs/volume.c
+++ b/libntfs/volume.c
@@ -75,23 +75,7 @@
  */
 ntfs_volume *ntfs_volume_alloc(void)
 {
-	ntfs_volume *vol;
-
-	vol = (ntfs_volume*)calloc(1, sizeof(ntfs_volume));
-	if (vol) {
-		vol->dev = NULL;
-		vol->vol_name = NULL;
-		vol->lcnbmp_ni = NULL;
-		vol->lcnbmp_na = NULL;
-		vol->mft_ni = NULL;
-		vol->mft_na = NULL;
-		vol->mftbmp_na = NULL;
-		vol->mftmirr_ni = NULL;
-		vol->mftmirr_na = NULL;
-		vol->upcase = NULL;
-		vol->attrdef = NULL;
-	}
-	return vol;
+	return calloc(1, sizeof(ntfs_volume));
 }
 
 /**