refactoring & images