removed a bit of boilerplate from the client api