image refactoring, text cleanup