Small refactor
Socket integrated