picture_t refactoring