Refactoring, working image collector