Adding little cleanups here or there to the raw API wrapper