cleanup: reorder sockets