Cleaned up socket a bit.