Refactored x11_forwarding