refactor code

1 job for !102 with users/rosakhuj/blobstore in 1 minute and 49 seconds (queued for 1 second)
latest merge request