Refactor code cinder
Fix storage actions