Add a storage type class and clean up
Clean up