images + refactor