Clean up code
Storage Size Analysis