code clean up + server URL corrected