Some more refactoring for image