some code cleanup
renamed Server to HttpClient
slightly modified indentation rules