storable_picture refactoring