little image class refactoring.