Pulled out table storage interaction and cleaned up.