Cleaned up 'Storable' instance