Code clean up, call nodes client and server correctly.