@@ -32,12 +32,11 @@
 @optional
 - (void)connection: (IRCConnection *)connection
    didCreateSocket: (OF_KINDOF(OFTCPSocket *))socket;
 - (void)connection: (IRCConnection *)connection
     didReceiveLine: (OFString *)line;
-- (void)connection: (IRCConnection *)connection
-       didSendLine: (OFString *)line;
+- (void)connection: (IRCConnection *)connection didSendLine: (OFString *)line;
 - (void)connectionWasEstablished: (IRCConnection *)connection;
 -	       (void)connection: (IRCConnection *)connection
   didFailToConnectWithException: (id)exception;
 - (void)connection: (IRCConnection *)connection
 	didSeeUser: (IRCUser *)user
@@ -84,12 +83,12 @@
 	uint16_t _port;
 	OFString *_Nullable _nickname, *_Nullable _username;
 	OFString *_Nullable _realname;
 	OFMutableDictionary OF_GENERIC(OFString *, OFMutableSet *) *_channels;
 	id <IRCConnectionDelegate> _Nullable _delegate;
-	of_string_encoding_t _fallbackEncoding;
-	of_time_interval_t _pingInterval, _pingTimeout;
+	OFStringEncoding _fallbackEncoding;
+	OFTimeInterval _pingInterval, _pingTimeout;
 	OFString *_Nullable _pingData;
 	OFTimer *_Nullable _pingTimer;
 	bool _fallbackEncodingUsed;
 }
 
@@ -100,30 +99,27 @@
     OFString *nickname, *username, *realname;
 @property OF_NULLABLE_PROPERTY (assign, nonatomic)
     id <IRCConnectionDelegate> delegate;
 @property OF_NULLABLE_PROPERTY (readonly, nonatomic)
     OF_KINDOF(OFTCPSocket *) socket;
-@property (nonatomic) of_string_encoding_t fallbackEncoding;
-@property (nonatomic) of_time_interval_t pingInterval, pingTimeout;
+@property (nonatomic) OFStringEncoding fallbackEncoding;
+@property (nonatomic) OFTimeInterval pingInterval, pingTimeout;
 
 + (instancetype)connection;
 - (void)sendLine: (OFString *)line;
 - (void)sendLineWithFormat: (OFConstantString *)line, ...;
 - (void)connect;
 - (void)disconnect;
 - (void)disconnectWithReason: (nullable OFString *)reason;
 - (void)joinChannel: (OFString *)channelName;
 - (void)leaveChannel: (OFString *)channel;
-- (void)leaveChannel: (OFString *)channel
-	      reason: (nullable OFString *)reason;
-- (void)sendMessage: (OFString *)message
-		 to: (OFString *)to;
-- (void)sendNotice: (OFString *)notice
-		to: (OFString *)to;
+- (void)leaveChannel: (OFString *)channel reason: (nullable OFString *)reason;
+- (void)sendMessage: (OFString *)message to: (OFString *)to;
+- (void)sendNotice: (OFString *)notice to: (OFString *)to;
 - (void)kickUser: (OFString *)user
 	 channel: (OFString *)channel
 	  reason: (nullable OFString *)reason;
 - (void)changeNicknameTo: (OFString *)nickname;
 - (nullable OFSet OF_GENERIC(OFString *) *)usersInChannel: (OFString *)channel;
 @end
 
 OF_ASSUME_NONNULL_END