Simplify with Storage

Simplify with Storage - Boxwell