Adding some comments, removed unnecessary Client in Main