[updated] image models trivial refactoring