1 files changed, 8 insertions, 27 deletions

diff --git a/bindings/objc/src/SwordBook.mm b/bindings/objc/src/SwordBook.mm
index bcee1e4..c11b800 100644
--- a/bindings/objc/src/SwordBook.mm
+++ b/bindings/objc/src/SwordBook.mm
@@ -24,17 +24,8 @@
 
 @synthesize contents;
 
-- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager {
-	self = [super initWithName:aName swordManager:aManager];
-    if(self) {
-        [self setContents:[NSMutableDictionary dictionary]];
-    }
-                         
-	return self;
-}
-
 - (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {
-    self = [super initWithSWModule:aModule swordManager:aManager];
+    self = [super initWithSWModule:aModule];
     if(self) {
         [self setContents:[NSMutableDictionary dictionary]];
     }
@@ -42,30 +33,20 @@
     return self;
 }
 
-- (void)finalize {
-    [super finalize];
-}
-
-- (void)dealloc {
-    [self setContents:nil];
-    
-    [super dealloc];
-}
-
 - (SwordModuleTreeEntry *)treeEntryForKey:(NSString *)treeKey {
     SwordModuleTreeEntry * ret;
     
-    [moduleLock lock];
+    [self.moduleLock lock];
     if(treeKey == nil) {
-        ret = [contents objectForKey:@"root"];
+        ret = contents[@"root"];
         if(ret == nil) {
             sword::TreeKeyIdx *tk = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey *)*(swModule));
             ret = [self _treeEntryForKey:tk];
             // add to content
-            [contents setObject:ret forKey:@"root"];
+            contents[@"root"] = ret;
         }
     } else {
-        ret = [contents objectForKey:treeKey];
+        ret = contents[treeKey];
         if(ret == nil) {
             const char *keyStr = [treeKey UTF8String];
             if(![self isUnicode]) {
@@ -77,16 +58,16 @@
             sword::TreeKeyIdx *key = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey *)*(swModule));
             ret = [self _treeEntryForKey:key];
             // add to content
-            [contents setObject:ret forKey:treeKey];
+            contents[treeKey] = ret;
         }
     }
-    [moduleLock unlock];
+    [self.moduleLock unlock];
     
     return ret;
 }
 
 - (SwordModuleTreeEntry *)_treeEntryForKey:(sword::TreeKeyIdx *)treeKey {
-    SwordModuleTreeEntry *ret = [[[SwordModuleTreeEntry alloc] init] autorelease];
+    SwordModuleTreeEntry *ret = [[SwordModuleTreeEntry alloc] init];
     
 	char *treeNodeName = (char *)treeKey->getText();
 	NSString *nName;