#4 Refactor images