Fixed typos, deleted utils, added base_client