slight refactor to client initializer