Code cleanup in Google and Http