Rename datastore_request to request and fix various cosmetic errors