cleaned up cloud storage template cosmetics