Cleaned a few things up to get ready for multiple sockets.