:lipstick: Refactor image endpoint