- code cleanup, - improved client response handling