Code cleanup
Use remote connection so that you can define the details