Clean up client code

Signed-off-by: Ian Macalinao <ian@giza.us>