cleanup/refactor imageon