Code review PR

Also, these methods are executing network requests and a database query. It'd be nice to indicate to the user (doc comments and/or name) that that is happening.