Refactor image captioning to be more expressive