Trying to condense client code