F/control socket refactor