@@ -75,20 +75,21 @@
 - (void)requestRoster
 {
 	XMPPIQ *iq;
 	OFXMLElement *query;
 
-	_rosterRequested = YES;
+	_rosterRequested = true;
 
 	iq = [XMPPIQ IQWithType: @"get"
 			     ID: [_connection generateStanzaID]];
 
 	query = [OFXMLElement elementWithName: @"query"
 				    namespace: XMPP_NS_ROSTER];
 
 	if ([_connection supportsRosterVersioning]) {
-		OFString *ver = [_dataStorage stringValueForPath: @"roster.ver"];
+		OFString *ver =
+		    [_dataStorage stringValueForPath: @"roster.ver"];
 
 		if (ver == nil)
 			ver = @"";
 
 		[query addAttributeWithName: @"ver"
@@ -101,11 +102,11 @@
 	     callbackTarget: self
 		   selector: @selector(XMPP_handleInitialRosterForConnection:
 				IQ:)];
 }
 
-- (BOOL)connection: (XMPPConnection*)connection
+- (bool)connection: (XMPPConnection*)connection
       didReceiveIQ: (XMPPIQ*)iq
 {
 	OFXMLElement *rosterElement;
 	OFXMLElement *element;
 	XMPPRosterItem *rosterItem;
@@ -112,14 +113,14 @@
 
 	rosterElement = [iq elementForName: @"query"
 				 namespace: XMPP_NS_ROSTER];
 
 	if (rosterElement == nil)
-		return NO;
+		return false;
 
 	if (![[iq type] isEqual: @"set"])
-		return NO;
+		return false;
 
 	element = [rosterElement elementForName: @"item"
 				      namespace: XMPP_NS_ROSTER];
 
 	if (element != nil) {
@@ -141,11 +142,11 @@
 		[_dataStorage save];
 	}
 
 	[connection sendStanza: [iq resultIQ]];
 
-	return YES;
+	return true;
 }
 
 - (void)addRosterItem: (XMPPRosterItem*)rosterItem
 {
 	[self updateRosterItem: rosterItem];