diff --git a/TrueCraft.Client/MultiplayerClient.cs b/TrueCraft.Client/MultiplayerClient.cs
index 72276b6..608eb30 100644
--- a/TrueCraft.Client/MultiplayerClient.cs
+++ b/TrueCraft.Client/MultiplayerClient.cs
@@ -27,7 +27,7 @@ namespace TrueCraft.Client
         public event EventHandler<ChunkEventArgs> ChunkUnloaded;
         public event PropertyChangedEventHandler PropertyChanged;
 
-        private long _connected;
+        private long connected;
 
         public TrueCraftUser User { get; set; }
         public ReadOnlyWorld World { get; private set; }
@@ -38,7 +38,7 @@ namespace TrueCraft.Client
         {
             get
             {
-                return Interlocked.Read(ref _connected) == 1;
+                return Interlocked.Read(ref connected) == 1;
             }
         }
 
@@ -48,9 +48,9 @@ namespace TrueCraft.Client
 
         private readonly PacketHandler[] PacketHandlers;
 
-        private SemaphoreSlim _sem = new SemaphoreSlim(1, 1);
+        private SemaphoreSlim sem = new SemaphoreSlim(1, 1);
 
-        private readonly CancellationTokenSource _cancel;
+        private readonly CancellationTokenSource cancel;
 
         private SocketAsyncEventArgsPool SocketPool { get; set; }
 
@@ -69,8 +69,8 @@ namespace TrueCraft.Client
             World.World.BlockRepository = repo;
             Physics = new PhysicsEngine(World, repo);
             SocketPool = new SocketAsyncEventArgsPool(100, 200, 65536);
-            _connected = 0;
-            _cancel = new CancellationTokenSource();
+            connected = 0;
+            cancel = new CancellationTokenSource();
         }
 
         public void RegisterPacketHandler(byte packetId, PacketHandler handler)
@@ -92,7 +92,7 @@ namespace TrueCraft.Client
         {
             if (e.SocketError == SocketError.Success)
             {
-                Interlocked.CompareExchange(ref _connected, 1, 0);
+                Interlocked.CompareExchange(ref connected, 1, 0);
 
                 Physics.AddEntity(this);
 
@@ -110,14 +110,14 @@ namespace TrueCraft.Client
             if (!Connected)
                 return;
 
-            Interlocked.CompareExchange(ref _connected, 0, 1);
+            Interlocked.CompareExchange(ref connected, 0, 1);
 
             QueuePacket(new DisconnectPacket("Disconnecting"));
 
             Client.Client.Shutdown(SocketShutdown.Send);
             Client.Close();
 
-            _cancel.Cancel();
+            cancel.Cancel();
         }
 
         public void QueuePacket(IPacket packet)
@@ -136,26 +136,26 @@ namespace TrueCraft.Client
                 byte[] buffer = writeStream.ToArray();
 
                 SocketAsyncEventArgs args = new SocketAsyncEventArgs();
-                args.Completed += Operation_Completed;
+                args.Completed += OperationCompleted;
                 args.SetBuffer(buffer, 0, buffer.Length);
 
                 if (Client != null && !Client.Client.SendAsync(args))
-                    Operation_Completed(this, args);
+                    OperationCompleted(this, args);
             }
         }
 
         private void StartReceive()
         {
             SocketAsyncEventArgs args = SocketPool.Get();
-            args.Completed += Operation_Completed;
+            args.Completed += OperationCompleted;
 
             if (!Client.Client.ReceiveAsync(args))
-                Operation_Completed(this, args);
+                OperationCompleted(this, args);
         }
 
-        private void Operation_Completed(object sender, SocketAsyncEventArgs e)
+        private void OperationCompleted(object sender, SocketAsyncEventArgs e)
         {
-            e.Completed -= Operation_Completed;
+            e.Completed -= OperationCompleted;
 
             switch (e.LastOperation)
             {
@@ -175,12 +175,12 @@ namespace TrueCraft.Client
             if (e.SocketError == SocketError.Success && e.BytesTransferred > 0)
             {
                 SocketAsyncEventArgs newArgs = SocketPool.Get();
-                newArgs.Completed += Operation_Completed;
+                newArgs.Completed += OperationCompleted;
 
                 if (Client != null && !Client.Client.ReceiveAsync(newArgs))
-                    Operation_Completed(this, newArgs);
+                    OperationCompleted(this, newArgs);
 
-                _sem.Wait(_cancel.Token);
+                sem.Wait(cancel.Token);
 
                 var packets = PacketReader.ReadPackets(this, e.Buffer, e.Offset, e.BytesTransferred, false);
 
@@ -190,8 +190,8 @@ namespace TrueCraft.Client
                         PacketHandlers[packet.ID](packet, this);
                 }
 
-                if (_sem != null)
-                    _sem.Release();
+                if (sem != null)
+                    sem.Release();
             }
             else
             {
@@ -320,10 +320,10 @@ namespace TrueCraft.Client
             {
                 Disconnect();
 
-                _sem.Dispose();
+                sem.Dispose();
             }
 
-            _sem = null;
+            sem = null;
         }
 
         ~MultiplayerClient()
diff --git a/TrueCraft.Core/Collections/ByteArraySegment.cs b/TrueCraft.Core/Collections/ByteArraySegment.cs
index e1f302f..8d85325 100644
--- a/TrueCraft.Core/Collections/ByteArraySegment.cs
+++ b/TrueCraft.Core/Collections/ByteArraySegment.cs
@@ -8,15 +8,15 @@ namespace TrueCraft.Core.Collections
 {
     public class ByteArraySegment : ICollection<byte>
     {
-        private readonly byte[] _array;
-        private readonly int _start;
-        private readonly int _count;
+        private readonly byte[] array;
+        private readonly int start;
+        private readonly int count;
 
         public ByteArraySegment(byte[] array, int start, int count)
         {
-            _array = array;
-            _start = start;
-            _count = count;
+            this.array = array;
+            this.start = start;
+            this.count = count;
         }
 
         public void Add(byte item)
@@ -31,12 +31,12 @@ namespace TrueCraft.Core.Collections
 
         public bool Contains(byte item)
         {
-            return _array.Contains(item);
+            return array.Contains(item);
         }
 
         public void CopyTo(byte[] target, int index)
         {
-            Buffer.BlockCopy(_array, _start, target, index, _count);
+            Buffer.BlockCopy(array, start, target, index, count);
         }
 
         public bool Remove(byte item)
@@ -48,7 +48,7 @@ namespace TrueCraft.Core.Collections
         {
             get
             {
-                return _count;
+                return count;
             }
         }
 
@@ -64,14 +64,14 @@ namespace TrueCraft.Core.Collections
         {
             get
             {
-                return _array[index];
+                return array[index];
             }
             set
             {
-                if (index > _array.Length)
+                if (index > array.Length)
                     throw new ArgumentOutOfRangeException("value");
 
-                _array[index] = value;
+                array[index] = value;
             }
         }
 
@@ -87,37 +87,37 @@ namespace TrueCraft.Core.Collections
 
         class ByteArraySegmentEnumerator : IEnumerator<byte>
         {
-            private byte _current;
-            private int _pos;
+            private byte current;
+            private int pos;
 
             private readonly ByteArraySegment _segment;
 
             public ByteArraySegmentEnumerator(ByteArraySegment segment)
             {
                 _segment = segment;
-                _pos = segment._start;
+                pos = segment.start;
             }
 
             public bool MoveNext()
             {
-                if (_pos >= _segment.Count)
+                if (pos >= _segment.Count)
                     return false;
 
-                _current = _segment._array[++_pos];
+                current = _segment.array[++pos];
 
                 return true;
             }
 
             public void Reset()
             {
-                _pos = _segment._start;
+                pos = _segment.start;
             }
 
             public byte Current
             {
                 get
                 {
-                    return _current;
+                    return current;
                 }
             }
 
diff --git a/TrueCraft.Core/Networking/BufferManager.cs b/TrueCraft.Core/Networking/BufferManager.cs
index 7d3dcde..a999446 100644
--- a/TrueCraft.Core/Networking/BufferManager.cs
+++ b/TrueCraft.Core/Networking/BufferManager.cs
@@ -8,42 +8,42 @@ namespace TrueCraft.Core.Networking
 {
     public class BufferManager
     {
-        private readonly object _bufferLocker = new object();
+        private readonly object bufferLocker = new object();
 
-        private readonly List<byte[]> _buffers;
+        private readonly List<byte[]> buffers;
 
-        private readonly int _bufferSize;
+        private readonly int bufferSize;
 
-        private readonly Stack<int> _availableBuffers;
+        private readonly Stack<int> availableBuffers;
 
         public BufferManager(int bufferSize)
         {
-            _bufferSize = bufferSize;
-            _buffers = new List<byte[]>();
-            _availableBuffers = new Stack<int>();
+            this.bufferSize = bufferSize;
+            buffers = new List<byte[]>();
+            availableBuffers = new Stack<int>();
         }
 
         public void SetBuffer(SocketAsyncEventArgs args)
         {
-            if (_availableBuffers.Count > 0)
+            if (availableBuffers.Count > 0)
             {
-                int index = _availableBuffers.Pop();
+                int index = availableBuffers.Pop();
 
                 byte[] buffer;
-                lock (_bufferLocker)
+                lock (bufferLocker)
                 {
-                    buffer = _buffers[index];
+                    buffer = buffers[index];
                 }
 
                 args.SetBuffer(buffer, 0, buffer.Length);
             }
             else
             {
-                byte[] buffer = new byte[_bufferSize];
+                byte[] buffer = new byte[bufferSize];
 
-                lock (_bufferLocker)
+                lock (bufferLocker)
                 {
-                    _buffers.Add(buffer);
+                    buffers.Add(buffer);
                 }
 
                 args.SetBuffer(buffer, 0, buffer.Length);
@@ -53,13 +53,13 @@ namespace TrueCraft.Core.Networking
         public void ClearBuffer(SocketAsyncEventArgs args)
         {
             int index;
-            lock (_bufferLocker)
+            lock (bufferLocker)
             {
-                index = _buffers.IndexOf(args.Buffer);
+                index = buffers.IndexOf(args.Buffer);
             }
 
             if (index >= 0)
-                _availableBuffers.Push(index);
+                availableBuffers.Push(index);
 
             args.SetBuffer(null, 0, 0);
         }
diff --git a/TrueCraft.Core/Networking/ByteListMemoryStream.cs b/TrueCraft.Core/Networking/ByteListMemoryStream.cs
index 4140be8..4381766 100644
--- a/TrueCraft.Core/Networking/ByteListMemoryStream.cs
+++ b/TrueCraft.Core/Networking/ByteListMemoryStream.cs
@@ -8,8 +8,8 @@ namespace TrueCraft.Core.Networking
 {
     public class ByteListMemoryStream : Stream
     {
-        private long _position;
-        private readonly List<byte> _buffer;
+        private long position;
+        private readonly List<byte> buffer;
 
         public ByteListMemoryStream() : this(new List<byte>())
         {
@@ -17,8 +17,8 @@ namespace TrueCraft.Core.Networking
 
         public ByteListMemoryStream(List<byte> buffer, int offset = 0)
         {
-            _position = offset;
-            _buffer = buffer;
+            position = offset;
+            this.buffer = buffer;
         }
 
         public override void Flush()
@@ -28,18 +28,18 @@ namespace TrueCraft.Core.Networking
         public override long Seek(long offset, SeekOrigin origin)
         {
             if (origin == SeekOrigin.Begin)
-                _position = offset;
+                position = offset;
             else if (origin == SeekOrigin.Current)
-                _position += offset;
+                position += offset;
             else //End
-                _position = (_buffer.Count - 1) - offset;
+                position = (buffer.Count - 1) - offset;
 
-            return _position;
+            return position;
         }
 
         public override void SetLength(long value)
         {
-            _buffer.RemoveRange((int)value, _buffer.Count - (int)value);
+            buffer.RemoveRange((int)value, buffer.Count - (int)value);
         }
 
         public override int Read(byte[] buffer, int offset, int count)
@@ -50,11 +50,11 @@ namespace TrueCraft.Core.Networking
             if (buffer.Length < count)
                 throw new ArgumentOutOfRangeException("count");
 
-            byte[] buf = _buffer.Skip((int)_position).Take(count).ToArray();
+            byte[] buf = this.buffer.Skip((int)position).Take(count).ToArray();
             
             Buffer.BlockCopy(buf, 0, buffer, offset, buf.Length);
 
-            _position += Math.Min(count, buf.Length);
+            position += Math.Min(count, buf.Length);
             
             return Math.Min(count, buf.Length);
         }
@@ -67,8 +67,8 @@ namespace TrueCraft.Core.Networking
             if (buffer.Length < count)
                 throw new ArgumentOutOfRangeException("count");
 
-            _buffer.AddRange(buffer.Skip(offset).Take(count));
-            _position += count;
+            this.buffer.AddRange(buffer.Skip(offset).Take(count));
+            position += count;
         }
 
         public override bool CanRead
@@ -99,7 +99,7 @@ namespace TrueCraft.Core.Networking
         {
             get
             {
-                return _buffer.Count;
+                return buffer.Count;
             }
         }
 
@@ -107,11 +107,11 @@ namespace TrueCraft.Core.Networking
         {
             get
             {
-                return _position;
+                return position;
             }
             set
             {
-                _position = value;
+                position = value;
             }
         }
     }
diff --git a/TrueCraft.Core/Networking/SocketAsyncEventArgsPool.cs b/TrueCraft.Core/Networking/SocketAsyncEventArgsPool.cs
index 3ace7ce..52424fd 100644
--- a/TrueCraft.Core/Networking/SocketAsyncEventArgsPool.cs
+++ b/TrueCraft.Core/Networking/SocketAsyncEventArgsPool.cs
@@ -9,17 +9,17 @@ namespace TrueCraft.Core.Networking
 {
     public class SocketAsyncEventArgsPool : IDisposable
     {
-        private readonly BlockingCollection<SocketAsyncEventArgs> _argsPool;
+        private readonly BlockingCollection<SocketAsyncEventArgs> argsPool;
 
-        private readonly int _maxPoolSize;
+        private readonly int maxPoolSize;
 
-        private BufferManager _bufferManager;
+        private BufferManager bufferManager;
 
         public SocketAsyncEventArgsPool(int poolSize, int maxSize, int bufferSize)
         {
-            _maxPoolSize = maxSize;
-            _argsPool = new BlockingCollection<SocketAsyncEventArgs>(new ConcurrentQueue<SocketAsyncEventArgs>());
-            _bufferManager = new BufferManager(bufferSize);
+            maxPoolSize = maxSize;
+            argsPool = new BlockingCollection<SocketAsyncEventArgs>(new ConcurrentQueue<SocketAsyncEventArgs>());
+            bufferManager = new BufferManager(bufferSize);
 
             Init(poolSize);
         }
@@ -28,21 +28,21 @@ namespace TrueCraft.Core.Networking
         {
             for (int i = 0; i < size; i++)
             {
-                _argsPool.Add(CreateEventArgs());
+                argsPool.Add(CreateEventArgs());
             }
         }
 
         public SocketAsyncEventArgs Get()
         {
             SocketAsyncEventArgs args;
-            if (!_argsPool.TryTake(out args))
+            if (!argsPool.TryTake(out args))
             {
                 args = CreateEventArgs();
             }
 
-            if (_argsPool.Count > _maxPoolSize)
+            if (argsPool.Count > maxPoolSize)
             {
-                Trim(_argsPool.Count - _maxPoolSize);
+                Trim(argsPool.Count - maxPoolSize);
             }
 
             return args;
@@ -50,14 +50,14 @@ namespace TrueCraft.Core.Networking
 
         public void Add(SocketAsyncEventArgs args)
         {
-            if (!_argsPool.IsAddingCompleted)
-                _argsPool.Add(args);
+            if (!argsPool.IsAddingCompleted)
+                argsPool.Add(args);
         }
 
         protected SocketAsyncEventArgs CreateEventArgs()
         {
             SocketAsyncEventArgs args = new SocketAsyncEventArgs();
-            _bufferManager.SetBuffer(args);
+            bufferManager.SetBuffer(args);
 
             return args;
         }
@@ -68,9 +68,9 @@ namespace TrueCraft.Core.Networking
             {
                 SocketAsyncEventArgs args;
 
-                if (_argsPool.TryTake(out args))
+                if (argsPool.TryTake(out args))
                 {
-                    _bufferManager.ClearBuffer(args);
+                    bufferManager.ClearBuffer(args);
                     args.Dispose();
                 }
             }
@@ -87,18 +87,18 @@ namespace TrueCraft.Core.Networking
         {
             if (disposing)
             {
-                _argsPool.CompleteAdding();
+                argsPool.CompleteAdding();
 
-                while (_argsPool.Count > 0)
+                while (argsPool.Count > 0)
                 {
-                    SocketAsyncEventArgs arg = _argsPool.Take();
+                    SocketAsyncEventArgs arg = argsPool.Take();
 
-                    _bufferManager.ClearBuffer(arg);
+                    bufferManager.ClearBuffer(arg);
                     arg.Dispose();
                 }
             }
 
-            _bufferManager = null;
+            bufferManager = null;
         }
 
         ~SocketAsyncEventArgsPool()
diff --git a/TrueCraft/RemoteClient.cs b/TrueCraft/RemoteClient.cs
index f51c2ec..f87c3f5 100644
--- a/TrueCraft/RemoteClient.cs
+++ b/TrueCraft/RemoteClient.cs
@@ -45,7 +45,7 @@ namespace TrueCraft
             PacketReader = packetReader;
             PacketHandlers = packetHandlers;
 
-            _cancel = new CancellationTokenSource();
+            cancel = new CancellationTokenSource();
 
             StartReceive();
         }
@@ -71,7 +71,7 @@ namespace TrueCraft
 
         public Socket Connection { get; private set; }
 
-        private SemaphoreSlim _sem = new SemaphoreSlim(1, 1);
+        private SemaphoreSlim sem = new SemaphoreSlim(1, 1);
 
         private SocketAsyncEventArgsPool SocketPool { get; set; }
 
@@ -83,7 +83,7 @@ namespace TrueCraft
 
         private long disconnected;
 
-        private readonly CancellationTokenSource _cancel;
+        private readonly CancellationTokenSource cancel;
 
         public bool Disconnected
         {
@@ -242,13 +242,13 @@ namespace TrueCraft
 
                 SocketAsyncEventArgs args = new SocketAsyncEventArgs();
                 args.UserToken = packet;
-                args.Completed += Operation_Completed;
+                args.Completed += OperationCompleted;
                 args.SetBuffer(buffer, 0, buffer.Length);
 
                 if (Connection != null)
                 {
                     if (!Connection.SendAsync(args))
-                        Operation_Completed(this, args);
+                        OperationCompleted(this, args);
                 }
             }
         }
@@ -256,15 +256,15 @@ namespace TrueCraft
         private void StartReceive()
         {
             SocketAsyncEventArgs args = SocketPool.Get();
-            args.Completed += Operation_Completed;
+            args.Completed += OperationCompleted;
 
             if (!Connection.ReceiveAsync(args))
-                Operation_Completed(this, args);
+                OperationCompleted(this, args);
         }
 
-        private void Operation_Completed(object sender, SocketAsyncEventArgs e)
+        private void OperationCompleted(object sender, SocketAsyncEventArgs e)
         {
-            e.Completed -= Operation_Completed;
+            e.Completed -= OperationCompleted;
 
             switch (e.LastOperation)
             {
@@ -292,12 +292,12 @@ namespace TrueCraft
             if (e.SocketError == SocketError.Success && e.BytesTransferred > 0)
             {
                 SocketAsyncEventArgs newArgs = SocketPool.Get();
-                newArgs.Completed += Operation_Completed;
+                newArgs.Completed += OperationCompleted;
 
                 if (!Connection.ReceiveAsync(newArgs))
-                    Operation_Completed(this, newArgs);
+                    OperationCompleted(this, newArgs);
 
-                _sem.Wait(_cancel.Token);
+                sem.Wait(cancel.Token);
 
                 var packets = PacketReader.ReadPackets(this, e.Buffer, e.Offset, e.BytesTransferred);
 
@@ -329,8 +329,8 @@ namespace TrueCraft
                     }
                 }
 
-                if (_sem != null)
-                    _sem.Release();
+                if (sem != null)
+                    sem.Release();
             }
             else
             {
@@ -348,7 +348,7 @@ namespace TrueCraft
             SocketAsyncEventArgs args = new SocketAsyncEventArgs();
             Connection.DisconnectAsync(args);
 
-            _cancel.Cancel();
+            cancel.Cancel();
         }
 
         public void SendMessage(string message)
@@ -506,10 +506,10 @@ namespace TrueCraft
 
                 Disconnect();
 
-                _sem.Dispose();
+                sem.Dispose();
             }
 
-            _sem = null;
+            sem = null;
         }
 
         ~RemoteClient()