Fixed JavaDoc
Changed method position for better readability
Apply Builder pattern to Client class