small refactoring
more images