Indent and image refactor