diff --git a/Sources/Criollo/CRConnection.m b/Sources/Criollo/CRConnection.m
index 3dbed0c..1e3b6f6 100644
--- a/Sources/Criollo/CRConnection.m
+++ b/Sources/Criollo/CRConnection.m
@@ -28,7 +28,7 @@ @interface CRConnection ()
 @property (nonatomic, weak, nullable) id<CRConnectionDelegate> delegate;
 
 @property (nonatomic, strong) NSLock *requestsLock;
-@property (nonatomic, strong) NSMutableArray<CRRequest *> * requests;
+@property (nonatomic, strong) NSMutableArray<CRRequest *> *requests;
 
 - (void)bufferBodyData:(NSData *)data request:(CRRequest *)request;
 
diff --git a/Sources/Criollo/CRConnection_Internal.h b/Sources/Criollo/CRConnection_Internal.h
index 402e962..86b952f 100644
--- a/Sources/Criollo/CRConnection_Internal.h
+++ b/Sources/Criollo/CRConnection_Internal.h
@@ -16,19 +16,19 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CRConnection () <GCDAsyncSocketDelegate>
 
-@property (nonatomic, strong, nullable) GCDAsyncSocket* socket;
-@property (nonatomic, weak) CRServer* server;
+@property (nonatomic, strong, nullable) GCDAsyncSocket *socket;
+@property (nonatomic, weak) CRServer *server;
 
 /// The current request being parsed. This is used internally as the data comes
 /// in from the socket. Once the request is fully formed, it can be passed on to
 /// be handled.
-@property (nonatomic, weak, nullable) CRRequest* requestBeingReceived;
+@property (nonatomic, weak, nullable) CRRequest *requestBeingReceived;
 
 /// HTTP Pipelining allows multiple requests to be send "in one go" and requires
 /// their responses to be sent in order. As these requests can be completed out
 /// of sequence, we'll keep a reference to the first request we need to send a
 /// response for.
-@property (nonatomic, weak, nullable) CRRequest* firstRequest;
+@property (nonatomic, weak, nullable) CRRequest *firstRequest;
 
 - (void)addRequest:(CRRequest *)request;
 - (void)removeRequest:(CRRequest *)request;
diff --git a/Sources/Criollo/Headers/Criollo/CRConnection.h b/Sources/Criollo/Headers/Criollo/CRConnection.h
index cd72aad..5f0f545 100644
--- a/Sources/Criollo/Headers/Criollo/CRConnection.h
+++ b/Sources/Criollo/Headers/Criollo/CRConnection.h
@@ -20,10 +20,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CRConnection : NSObject
 
-@property (nonatomic, readonly) NSString* remoteAddress;
-@property (nonatomic, readonly) NSUInteger remotePort;
-@property (nonatomic, readonly) NSString* localAddress;
-@property (nonatomic, readonly) NSUInteger localPort;
+@property (nonatomic, readonly) NSString *remoteAddress;
+@property (nonatomic, readonly) uint16_t remotePort;
+@property (nonatomic, readonly) NSString *localAddress;
+@property (nonatomic, readonly) uint16_t localPort;
 
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;