diff --git a/macosx/FileBrowserCell.m b/macosx/FileBrowserCell.m
index ab588ef55..229265d2f 100644
--- a/macosx/FileBrowserCell.m
+++ b/macosx/FileBrowserCell.m
@@ -69,7 +69,7 @@
     [paragraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
     
     BOOL highlighted = [self isHighlighted] && [[self highlightColorWithFrame: cellFrame inView: controlView]
-                                    isEqual: [NSColor alternateSelectedControlColor]];
+                                                isEqual: [NSColor alternateSelectedControlColor]];
     NSDictionary * nameAttributes = [[NSDictionary alloc] initWithObjectsAndKeys:
                     highlighted ? [NSColor whiteColor] : [NSColor controlTextColor], NSForegroundColorAttributeName,
                     [NSFont messageFontOfSize: 12.0], NSFontAttributeName,
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index ca08964a1..022e9d8ac 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -192,41 +192,35 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
 
 - (void) dealloc
 {
-    #warning cleanup
-    if (fHandle)
-    {
-        if (fDownloadFolder)
-            [fDownloadFolder release];
-        if (fIncompleteFolder)
-            [fIncompleteFolder release];
+    [fDownloadFolder release];
+    [fIncompleteFolder release];
         
-        if (fPublicTorrentLocation)
-            [fPublicTorrentLocation release];
+    [fPublicTorrentLocation release];
+    
+    
+    [fDateAdded release];
+    [fDateCompleted release];
+    [fDateActivity release];
         
-        [fDateAdded release];
-		if (fDateCompleted)
-			[fDateCompleted release];
-        if (fDateActivity)
-			[fDateActivity release];
+    [fAnnounceDate release];
         
-        if (fAnnounceDate)
-            [fAnnounceDate release];
+    [fIcon release];
+    [fIconFlipped release];
+    [fIconSmall release];
         
-        [fIcon release];
-        [fIconFlipped release];
-        [fIconSmall release];
+    [fProgressString release];
+    [fStatusString release];
+    [fShortStatusString release];
+    [fRemainingTimeString release];
         
-        [fProgressString release];
-        [fStatusString release];
-        [fShortStatusString release];
-        [fRemainingTimeString release];
+    [fFileList release];
+    [fFlatFileList release];
         
-        [fFileList release];
-        [fFlatFileList release];
-        
-        [fBitmap release];
+    [fBitmap release];
+    
+    if (fPieces)
         free(fPieces);
-    }
+    
     [super dealloc];
 }