Default image refactoring