Cleaned up cloud code. And update fetching method