@@ -63,16 +63,16 @@
 @end
 
 OF_ASSUME_NONNULL_END
 
 @implementation X509Certificate
-- init
+- (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithFile: (OFString *)path
+- (instancetype)initWithFile: (OFString *)path
 {
 	self = [super init];
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
@@ -91,11 +91,11 @@
 	}
 
 	return self;
 }
 
-- initWithX509Struct: (X509 *)certificate
+- (instancetype)initWithX509Struct: (X509 *)certificate
 {
 	self = [super init];
 
 	@try {
 		_certificate = X509_dup(certificate);
@@ -211,12 +211,11 @@
 				key = [self X509_stringFromASN1Object:
 					otherName->type_id];
 				list = [types objectForKey: key];
 				if (list == nil) {
 					list = [OFList list];
-					[types setObject: list
-						  forKey: key];
+					[types setObject: list forKey: key];
 				}
 
 				[list appendObject:
 				    [self X509_stringFromASN1String:
 					otherName->value->value.asn1_string]];
@@ -286,13 +285,12 @@
 
 - (bool)hasCommonNameMatchingDomain: (OFString *)domain
 {
 	void *pool = objc_autoreleasePoolPush();
 
-	for (OFString *name in [[self subject] objectForKey: OID_commonName]) {
-		if ([self X509_isAssertedDomain: name
-				    equalDomain: domain]) {
+	for (OFString *name in [self.subject objectForKey: OID_commonName]) {
+		if ([self X509_isAssertedDomain: name equalDomain: domain]) {
 			objc_autoreleasePoolPop(pool);
 			return true;
 		}
 	}
 
@@ -303,13 +301,12 @@
 - (bool)hasDNSNameMatchingDomain: (OFString *)domain
 {
 	void *pool = objc_autoreleasePoolPush();
 
 	for (OFString *name in
-	    [[self subjectAlternativeName] objectForKey: @"dNSName"]) {
-		if ([self X509_isAssertedDomain: name
-				    equalDomain: domain]) {
+	    [self.subjectAlternativeName objectForKey: @"dNSName"]) {
+		if ([self X509_isAssertedDomain: name equalDomain: domain]) {
 			objc_autoreleasePoolPop(pool);
 			return true;
 		}
 	}
 
@@ -322,11 +319,11 @@
 {
 	size_t serviceLength;
 	void *pool = objc_autoreleasePoolPush();
 	OFDictionary *SANs = self.subjectAlternativeName;
 	OFList *assertedNames = [[SANs objectForKey: @"otherName"]
-				       objectForKey: OID_SRVName];
+	    objectForKey: OID_SRVName];
 
 	if (![service hasPrefix: @"_"])
 		service = [service stringByPrependingString: @"_"];
 
 	service = [service stringByAppendingString: @"."];
@@ -375,11 +372,11 @@
 		return false;
 
 	domain = [domain substringWithRange:
 	    of_range(firstDot + 1, domain.length - firstDot - 1)];
 
-	if (![asserted caseInsensitiveCompare: domain])
+	if ([asserted caseInsensitiveCompare: domain] == 0)
 		return true;
 
 	return false;
 }
 
@@ -396,12 +393,11 @@
 		ASN1_OBJECT *obj = X509_NAME_ENTRY_get_object(entry);
 		ASN1_STRING *str = X509_NAME_ENTRY_get_data(entry);
 		key = [self X509_stringFromASN1Object: obj];
 
 		if ([dict objectForKey: key] == nil)
-			[dict setObject: [OFList list]
-				 forKey: key];
+			[dict setObject: [OFList list] forKey: key];
 
 		value = [self X509_stringFromASN1String: str];
 		[[dict objectForKey: key] appendObject: value];
 
 		objc_autoreleasePoolPop(pool);
@@ -451,16 +447,16 @@
 	return ret;
 }
 @end
 
 @implementation X509OID
-- init
+- (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- initWithUTF8String: (const char *)string
+- (instancetype)initWithUTF8String: (const char *)string
 {
 	self = [super init];
 
 	@try {
 		_string = [[OFString alloc] initWithUTF8String: string];
@@ -502,10 +498,10 @@
 - (unsigned long)hash
 {
 	return _string.hash;
 }
 
-- copy
+- (id)copy
 {
 	return [self retain];
 }
 @end