diff --git a/IOStream/AesInputStream.h b/IOStream/AesInputStream.h
index 8b62eff9..7c432eee 100644
--- a/IOStream/AesInputStream.h
+++ b/IOStream/AesInputStream.h
@@ -32,6 +32,6 @@
     BOOL eof;
 }
 
-- (id)initWithInputStream:(InputStream*)stream key:(NSData*)key iv:(NSData*)iv;
+- (id)initWithInputStream:(InputStream *)stream key:(NSData *)key iv:(NSData *)iv;
 
 @end
diff --git a/IOStream/AesInputStream.m b/IOStream/AesInputStream.m
index 35be4e9d..de0a6389 100644
--- a/IOStream/AesInputStream.m
+++ b/IOStream/AesInputStream.m
@@ -22,7 +22,7 @@ - (BOOL)decrypt;
 
 @implementation AesInputStream
 
-- (id)initWithInputStream:(InputStream*)stream key:(NSData*)key iv:(NSData*)iv {
+- (id)initWithInputStream:(InputStream *)stream key:(NSData *)key iv:(NSData *)iv {
     self = [super init];
     if (self) {
         inputStream = stream;
@@ -40,7 +40,7 @@ - (void)dealloc {
     CCCryptorRelease(cryptorRef);
 }
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength {
     NSUInteger remaining = bytesLength;
     NSUInteger offset = 0;
     NSUInteger n;
@@ -53,7 +53,7 @@ - (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
         }
         
         n = MIN(remaining, bufferSize - bufferOffset);       
-        memcpy(((uint8_t*)bytes) + offset, outputBuffer + bufferOffset, n);
+        memcpy(((uint8_t *)bytes) + offset, outputBuffer + bufferOffset, n);
         
         bufferOffset += n;
         
diff --git a/IOStream/AesOutputStream.h b/IOStream/AesOutputStream.h
index 39d8b66c..f525c28f 100644
--- a/IOStream/AesOutputStream.h
+++ b/IOStream/AesOutputStream.h
@@ -28,6 +28,6 @@
     uint8_t *buffer;
 }
 
-- (id)initWithOutputStream:(OutputStream*)stream key:(NSData*)key iv:(NSData*)iv;
+- (id)initWithOutputStream:(OutputStream *)stream key:(NSData *)key iv:(NSData *)iv;
 
 @end
diff --git a/IOStream/AesOutputStream.m b/IOStream/AesOutputStream.m
index bb38be89..ad8cc0c6 100644
--- a/IOStream/AesOutputStream.m
+++ b/IOStream/AesOutputStream.m
@@ -22,7 +22,7 @@ - (void)ensureBufferCapacity:(size_t)capacity;
 
 @implementation AesOutputStream
 
-- (id)initWithOutputStream:(OutputStream*)stream key:(NSData*)key iv:(NSData*)iv {
+- (id)initWithOutputStream:(OutputStream *)stream key:(NSData *)key iv:(NSData *)iv {
     self = [super init];
     if (self) {
         outputStream = stream;
diff --git a/IOStream/Arc4RandomStream.h b/IOStream/Arc4RandomStream.h
index 8dd9cd4a..8006f096 100644
--- a/IOStream/Arc4RandomStream.h
+++ b/IOStream/Arc4RandomStream.h
@@ -21,6 +21,6 @@
 }
 
 - (id)init;
-- (id)init:(NSData*)key;
+- (id)init:(NSData *)key;
 
 @end
diff --git a/IOStream/Arc4RandomStream.m b/IOStream/Arc4RandomStream.m
index 293f9b51..d074704e 100644
--- a/IOStream/Arc4RandomStream.m
+++ b/IOStream/Arc4RandomStream.m
@@ -23,7 +23,7 @@ - (id)init {
     return [self init:[NSData dataWithBytes:buffer length:sizeof(buffer)]];
 }
 
-- (id)init:(NSData*)key {
+- (id)init:(NSData *)key {
     self = [super init];
     if (self) {
         const uint8_t *bytes = key.bytes;
diff --git a/IOStream/DataInputStream.h b/IOStream/DataInputStream.h
index 8237f83d..d218ab47 100644
--- a/IOStream/DataInputStream.h
+++ b/IOStream/DataInputStream.h
@@ -23,6 +23,6 @@
     NSUInteger dataOffset;
 }
 
-- (id)initWithData:(NSData*)d;
+- (id)initWithData:(NSData *)d;
 
 @end
diff --git a/IOStream/DataInputStream.m b/IOStream/DataInputStream.m
index e230dcac..864aad51 100644
--- a/IOStream/DataInputStream.m
+++ b/IOStream/DataInputStream.m
@@ -19,7 +19,7 @@
 
 @implementation DataInputStream
 
-- (id)initWithData:(NSData*)d {
+- (id)initWithData:(NSData *)d {
     self = [super init];
     if (self) {
         data = d;
@@ -28,7 +28,7 @@ - (id)initWithData:(NSData*)d {
     return self;
 }
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength {
     NSRange range;
     range.location = dataOffset;
     range.length = MIN([data length] - dataOffset, bytesLength);
diff --git a/IOStream/FileInputStream.h b/IOStream/FileInputStream.h
index ce7ed41a..1b55a728 100644
--- a/IOStream/FileInputStream.h
+++ b/IOStream/FileInputStream.h
@@ -22,7 +22,7 @@
     int fd;
 }
 
-- (id)initWithFilename:(NSString*)filename;
-- (NSInteger)seek:(NSUInteger)offset;
+- (id)initWithFilename:(NSString *)filename;
+- (off_t)seek:(off_t)offset;
 
 @end
diff --git a/IOStream/FileInputStream.m b/IOStream/FileInputStream.m
index ef4836b7..5b757bd0 100644
--- a/IOStream/FileInputStream.m
+++ b/IOStream/FileInputStream.m
@@ -21,7 +21,7 @@
 
 @implementation FileInputStream
 
-- (id)initWithFilename:(NSString*)filename {
+- (id)initWithFilename:(NSString *)filename {
     self = [super init];
     if (self) {
         fd = open([filename UTF8String], O_RDONLY);
@@ -36,11 +36,11 @@ - (void)dealloc {
     [self close];
 }
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength {
     return read(fd, bytes, bytesLength);
 }
 
-- (NSInteger)seek:(NSUInteger)offset {
+- (off_t)seek:(off_t)offset {
     return lseek(fd, offset, SEEK_SET);
 }
 
diff --git a/IOStream/FileOutputStream.h b/IOStream/FileOutputStream.h
index 27fb3fc6..061a0a25 100644
--- a/IOStream/FileOutputStream.h
+++ b/IOStream/FileOutputStream.h
@@ -24,6 +24,6 @@
 }
 
 - (id)initWithFilename:(NSString*)filename flags:(int)flags mode:(mode_t)mode;
-- (NSInteger)seek:(NSUInteger)offset;
+- (off_t)seek:(off_t)offset;
 
 @end
diff --git a/IOStream/FileOutputStream.m b/IOStream/FileOutputStream.m
index e2fafef3..5b7d7643 100644
--- a/IOStream/FileOutputStream.m
+++ b/IOStream/FileOutputStream.m
@@ -38,7 +38,7 @@ - (NSUInteger)write:(const void *)bytes length:(NSUInteger)bytesLength {
     return write(fd, bytes, bytesLength);
 }
 
-- (NSInteger)seek:(NSUInteger)offset {
+- (off_t)seek:(off_t)offset {
     return lseek(fd, offset, SEEK_SET);
 }
 
diff --git a/IOStream/GZipInputStream.h b/IOStream/GZipInputStream.h
index 8a4a00d7..f5e8cbdd 100644
--- a/IOStream/GZipInputStream.h
+++ b/IOStream/GZipInputStream.h
@@ -33,6 +33,6 @@
     BOOL eof;
 }
 
-- (id)initWithInputStream:(InputStream*)stream;
+- (id)initWithInputStream:(InputStream *)stream;
 
 @end
diff --git a/IOStream/GZipInputStream.m b/IOStream/GZipInputStream.m
index bc346027..63d8399e 100644
--- a/IOStream/GZipInputStream.m
+++ b/IOStream/GZipInputStream.m
@@ -23,7 +23,7 @@ - (BOOL)decompress;
 
 @implementation GZipInputStream
 
-- (id)initWithInputStream:(InputStream*)stream {
+- (id)initWithInputStream:(InputStream *)stream {
     self = [super init];
     if (self) {
         inputStream = stream;
@@ -42,7 +42,7 @@ - (id)initWithInputStream:(InputStream*)stream {
     return self;
 }
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength {
     NSUInteger remaining = bytesLength;
     NSUInteger offset = 0;
     NSUInteger n;
diff --git a/IOStream/GZipOutputStream.h b/IOStream/GZipOutputStream.h
index ea9d4cfe..caf53f18 100644
--- a/IOStream/GZipOutputStream.h
+++ b/IOStream/GZipOutputStream.h
@@ -28,6 +28,6 @@
     uint8_t buffer[GZIP_OUTPUT_BUFFERSIZE];
 }
 
-- (id)initWithOutputStream:(OutputStream*)stream;
+- (id)initWithOutputStream:(OutputStream *)stream;
 
 @end
diff --git a/IOStream/GZipOutputStream.m b/IOStream/GZipOutputStream.m
index 41ac13cd..d3a71f1a 100644
--- a/IOStream/GZipOutputStream.m
+++ b/IOStream/GZipOutputStream.m
@@ -19,7 +19,7 @@
 
 @implementation GZipOutputStream
 
-- (id)initWithOutputStream:(OutputStream*)stream {
+- (id)initWithOutputStream:(OutputStream *)stream {
     self = [super init];
     if (self) {
         outputStream = stream;
@@ -42,7 +42,7 @@ - (NSUInteger)write:(const void *)bytes length:(NSUInteger)bytesLength {
     int n;
     
     zstream.avail_in = (unsigned int)bytesLength;
-    zstream.next_in = (void*)bytes;
+    zstream.next_in = (void *)bytes;
     
     while (zstream.avail_in > 0) {
         do {
diff --git a/IOStream/HashedInputStream.h b/IOStream/HashedInputStream.h
index a667063c..a73e8dca 100644
--- a/IOStream/HashedInputStream.h
+++ b/IOStream/HashedInputStream.h
@@ -30,6 +30,6 @@
     BOOL eof;
 }
 
-- (id)initWithInputStream:(InputStream*)stream;
+- (id)initWithInputStream:(InputStream *)stream;
 
 @end
diff --git a/IOStream/HashedInputStream.m b/IOStream/HashedInputStream.m
index 9eecd702..63bebb99 100644
--- a/IOStream/HashedInputStream.m
+++ b/IOStream/HashedInputStream.m
@@ -24,7 +24,7 @@ - (BOOL)readHashedBlock;
 
 @implementation HashedInputStream
 
-- (id)initWithInputStream:(InputStream*)stream {
+- (id)initWithInputStream:(InputStream *)stream {
     self = [super init];
     if (self) {
         inputStream = stream;
@@ -42,7 +42,7 @@ - (void)dealloc {
     }
 }
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength {
     NSUInteger remaining = bytesLength;
     NSUInteger offset = 0;
     
diff --git a/IOStream/HashedOutputStream.h b/IOStream/HashedOutputStream.h
index abe76c40..7fbf6222 100644
--- a/IOStream/HashedOutputStream.h
+++ b/IOStream/HashedOutputStream.h
@@ -28,6 +28,6 @@
     uint32_t bufferLength;
 }
 
-- (id)initWithOutputStream:(OutputStream*)stream blockSize:(uint32_t)blockSize;
+- (id)initWithOutputStream:(OutputStream *)stream blockSize:(uint32_t)blockSize;
 
 @end
diff --git a/IOStream/HashedOutputStream.m b/IOStream/HashedOutputStream.m
index f342b961..37837ce7 100644
--- a/IOStream/HashedOutputStream.m
+++ b/IOStream/HashedOutputStream.m
@@ -24,7 +24,7 @@ - (void)writeHashedBlock;
 
 @implementation HashedOutputStream
 
-- (id)initWithOutputStream:(OutputStream*)stream blockSize:(uint32_t)blockSize {
+- (id)initWithOutputStream:(OutputStream *)stream blockSize:(uint32_t)blockSize {
     self = [super init];
     if (self) {
         outputStream = stream;
diff --git a/IOStream/InputStream.h b/IOStream/InputStream.h
index 0555b038..5c5204d5 100644
--- a/IOStream/InputStream.h
+++ b/IOStream/InputStream.h
@@ -21,16 +21,16 @@
     
 }
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength;
-- (NSData*)readData:(NSUInteger)length;
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength;
+- (NSData *)readData:(NSUInteger)length;
 
 - (uint8_t)readInt8;
 - (uint16_t)readInt16;
 - (uint32_t)readInt32;
 - (uint64_t)readInt64;
 
-- (NSString*)readString:(NSUInteger)length encoding:(NSStringEncoding)encoding;
-- (NSString*)readCString:(NSUInteger)length encoding:(NSStringEncoding)encoding;
+- (NSString *)readString:(NSUInteger)length encoding:(NSStringEncoding)encoding;
+- (NSString *)readCString:(NSUInteger)length encoding:(NSStringEncoding)encoding;
 
 - (NSUInteger)skip:(NSUInteger)length;
 
diff --git a/IOStream/InputStream.m b/IOStream/InputStream.m
index d4d0baac..521f9502 100644
--- a/IOStream/InputStream.m
+++ b/IOStream/InputStream.m
@@ -19,12 +19,12 @@
 
 @implementation InputStream
 
-- (NSUInteger)read:(void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)read:(void *)bytes length:(NSUInteger)bytesLength {
     [self doesNotRecognizeSelector:_cmd];
     return 0;
 }
 
-- (NSData*)readData:(NSUInteger)length {
+- (NSData *)readData:(NSUInteger)length {
     uint8_t *bytes = calloc(sizeof(uint8_t), length);
     
     [self read:bytes length:length];
@@ -66,7 +66,7 @@ - (uint64_t)readInt64 {
     return value;
 }
 
-- (NSString*)readString:(NSUInteger)length encoding:(NSStringEncoding)encoding {
+- (NSString *)readString:(NSUInteger)length encoding:(NSStringEncoding)encoding {
     uint8_t bytes[length];
     
     [self read:bytes length:length];
@@ -74,7 +74,7 @@ - (NSString*)readString:(NSUInteger)length encoding:(NSStringEncoding)encoding {
     return [[NSString alloc] initWithBytes:bytes length:length encoding:encoding];
 }
 
-- (NSString*)readCString:(NSUInteger)length encoding:(NSStringEncoding)encoding {
+- (NSString *)readCString:(NSUInteger)length encoding:(NSStringEncoding)encoding {
     char str[length];
     
     [self read:str length:length];
diff --git a/IOStream/OutputStream.h b/IOStream/OutputStream.h
index c15c7d2c..4a7e371c 100644
--- a/IOStream/OutputStream.h
+++ b/IOStream/OutputStream.h
@@ -21,8 +21,8 @@
     
 }
 
-- (NSUInteger)write:(const void*)bytes length:(NSUInteger)bytesLength;
-- (NSUInteger)write:(NSData*)data;
+- (NSUInteger)write:(const void *)bytes length:(NSUInteger)bytesLength;
+- (NSUInteger)write:(NSData *)data;
 
 - (void)writeInt8:(uint8_t)value;
 - (void)writeInt16:(uint16_t)value;
diff --git a/IOStream/OutputStream.m b/IOStream/OutputStream.m
index 140c1f80..53520ee0 100644
--- a/IOStream/OutputStream.m
+++ b/IOStream/OutputStream.m
@@ -19,12 +19,12 @@
 
 @implementation OutputStream
 
-- (NSUInteger)write:(const void*)bytes length:(NSUInteger)bytesLength {
+- (NSUInteger)write:(const void *)bytes length:(NSUInteger)bytesLength {
     [self doesNotRecognizeSelector:_cmd];
     return 0;
 }
 
-- (NSUInteger)write:(NSData*)data {
+- (NSUInteger)write:(NSData *)data {
     return [self write:[data bytes] length:[data length]];
 }
 
diff --git a/IOStream/Sha256OutputStream.h b/IOStream/Sha256OutputStream.h
index 31005af0..a45a8a63 100644
--- a/IOStream/Sha256OutputStream.h
+++ b/IOStream/Sha256OutputStream.h
@@ -27,6 +27,6 @@
 }
 
 - (id)initWithOutputStream:(OutputStream *)stream;
-- (uint8_t*)getHash;
+- (uint8_t *)getHash;
 
 @end
diff --git a/IOStream/Sha256OutputStream.m b/IOStream/Sha256OutputStream.m
index f1c75682..e00e6eb2 100644
--- a/IOStream/Sha256OutputStream.m
+++ b/IOStream/Sha256OutputStream.m
@@ -40,7 +40,7 @@ - (void)close {
     CC_SHA256_Final(hash, &shaCtx);
 }
 
-- (uint8_t*)getHash {
+- (uint8_t *)getHash {
     return hash;
 }